projects / pithos-ms-client / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 07ec1cc 1865ad9)
Merge branch 'master' of https://code.grnet.gr/git/pithos-ms-client
authorGeorge Pantazis <gpant@noc.grnet.gr>
Mon, 30 Apr 2012 12:31:42 +0000 (15:31 +0300)
committerGeorge Pantazis <gpant@noc.grnet.gr>
Mon, 30 Apr 2012 12:31:42 +0000 (15:31 +0300)
commitd808362176174b1eacda403b8046e41e13a69834
treed97e888ab48f027060652b5849827aa45383bc82tree | snapshot
parent07ec1cc62bf1fb10477c681a3b99b51a0c298916commit | diff
parent1865ad904d16c957b461d4f539cd762dfaf29daecommit | diff
Merge branch 'master' of https://code.grnet.gr/git/pithos-ms-client

Conflicts:
trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs

Signed-off-by: George Pantazis <gpant@noc.grnet.gr>
trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.