projects / pithos-ms-client / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: aecc5f3 2b0ec5b)
Merge branch 'master' of https://code.grnet.gr/git/pithos-ms-client
authorGeorge Pantazis <gpant@noc.grnet.gr>
Mon, 30 Apr 2012 17:23:28 +0000 (20:23 +0300)
committerGeorge Pantazis <gpant@noc.grnet.gr>
Mon, 30 Apr 2012 17:23:28 +0000 (20:23 +0300)
commite1eaac3ad0fe91973fc232f1d37ba22cd4c55750
treed1a59b43d7496643bcaf514ee34e5886f4a2e012tree | snapshot
parentaecc5f3315b9163fe7cd740ec7744e5764d65965commit | diff
parent2b0ec5b83deb6c61ffae7943da4606733b0f5e76commit | 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.