Revision e9c9322c
ID | e9c9322cabbf4b93bfb8e2cd64fd156e9d8b0350 |
Merge branch 'Polling' of https://code.grnet.gr/git/pithos-ms-client into Polling
Conflicts:
trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml
Signed-off-by: George Pantazis <gpant@noc.grnet.gr>
Files
- added
- modified
- copied
- renamed
- deleted