Synnefo » Pithos MS Client

Revision 1cf5689c

ID	1cf5689c4d15b8cb0c5a70543d4ec536beea2c40

Added by Panagiotis Kanavos over 11 years ago

Merge branch 'master' of \\\pk2010\Pithos\

Conflicts:
trunk/Pithos.Client.WPF/Shell/BalloonIconConverter.cs

Files

• added
• modified
• copied
• renamed
• deleted