projects / pithos-ms-client / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 854192a 8b6aa65)
Merge branch 'master' of https://code.grnet.gr/git/pithos-ms-client
authorGeorge Pantazis <gpant@noc.grnet.gr>
Tue, 8 May 2012 16:10:52 +0000 (19:10 +0300)
committerGeorge Pantazis <gpant@noc.grnet.gr>
Tue, 8 May 2012 16:10:52 +0000 (19:10 +0300)
commitecd1dddfd45aa4a4553dd199b7413b6fbe6aeb26
tree2996e042de7493d038a49220425ff27228789d08tree | snapshot
parent854192a94903e9ea13b769d5dc82fc7244dbeb93commit | diff
parent8b6aa653d6c8a8cc3c40a93fca96459df726135acommit | diff
Merge branch 'master' of https://code.grnet.gr/git/pithos-ms-client

Conflicts:
trunk/Pithos.Client.WPF/SelectiveSynch/SelectiveSynchViewModel.cs

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