History | View | Annotate | Download (9.7 kB)
Merge branch 'master' of \\\pk2010\Pithos\
Conflicts: trunk/Pithos.Client.WPF/Shell/BalloonIconConverter.cs
Added FileSystemWatcherAdapter.cs to raise Moved events from the sequence of Deleted, Created events raised by FileSystemWatcher.Modified PreferencesViewModel.cs to URLEncode the token when opening the Pithos site