Merge branch 'master' of \\\pk2010\Pithos\
authorPanagiotis Kanavos <pkanavos@gmail.com>
Mon, 6 Feb 2012 18:40:26 +0000 (20:40 +0200)
committerPanagiotis Kanavos <pkanavos@gmail.com>
Mon, 6 Feb 2012 18:40:26 +0000 (20:40 +0200)
commit1cf5689c4d15b8cb0c5a70543d4ec536beea2c40
tree61eb938f48f66b324b939f14ace6497f6e2cab2b
parentb449fa4901bb1a76a24091f3a2192a0537d99a26
parentf327ad2b1615246cca71094d9d70d4d34e87a749
Merge branch 'master' of \\\pk2010\Pithos\

Conflicts:
trunk/Pithos.Client.WPF/Shell/BalloonIconConverter.cs
35 files changed:
trunk/Pithos.Client.WPF/Caliburn/Micro/Logging/DebugLogger.cs
trunk/Pithos.Client.WPF/Caliburn/Micro/Logging/log4netLogger.cs
trunk/Pithos.Client.WPF/Configuration/PithosSettings.cs
trunk/Pithos.Client.WPF/FileProperties/FilePropertiesViewModel.cs
trunk/Pithos.Client.WPF/PithosAccount.cs
trunk/Pithos.Client.WPF/Preferences/PreferencesViewModel.cs
trunk/Pithos.Client.WPF/Services/StatusService.cs
trunk/Pithos.Client.WPF/Shell/AboutViewModel.cs
trunk/Pithos.Client.WPF/Shell/BalloonIconConverter.cs
trunk/Pithos.Client.WPF/Shell/FeedbackViewModel.cs
trunk/Pithos.Core.Test/ExtensionTests.cs
trunk/Pithos.Core/Agents/BlockExtensions.cs
trunk/Pithos.Core/Agents/CollectionExtensions.cs
trunk/Pithos.Core/Agents/FileSystemWatcherAdapter.cs
trunk/Pithos.Core/Agents/MovedEventArgs.cs
trunk/Pithos.Core/Agents/NetworkAgent.cs
trunk/Pithos.Core/Agents/WorkflowAgent.cs
trunk/Pithos.Core/FileState.cs
trunk/Pithos.Core/IStatusService.cs
trunk/Pithos.Core/JobQueue.cs
trunk/Pithos.Core/NetworkGate.cs
trunk/Pithos.Interfaces/AccountSettings.cs
trunk/Pithos.Interfaces/PithosSettingsData.cs
trunk/Pithos.Network/CloudFilesClient.cs
trunk/Pithos.Network/RestClient.cs
trunk/Pithos.ShellExtensions/FileContext.cs
trunk/Pithos.ShellExtensions/IoC.cs
trunk/Pithos.ShellExtensions/LogCategories.cs
trunk/Pithos.ShellExtensions/Menus/DisplayFlags.cs
trunk/Pithos.ShellExtensions/Menus/FileContextMenu.cs
trunk/Pithos.ShellExtensions/Overlays/AddedIcodOverlay.cs
trunk/Pithos.ShellExtensions/Overlays/UnversionedIconOverlay.cs
trunk/Pithos.ShellExtensions/PithosHost.cs
trunk/Pithos.ShellExtensions/ShellSettings.cs
trunk/Pithos.ShellExtensions/ShellStatusChecker.cs