projects / pithos-ms-client / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e0f6980 4671d60)
Merge branch 'master' of https://code.grnet.gr/git/pithos-ms-client
authorpkanavos <pkanavos@gmail.com>
Tue, 15 May 2012 14:39:11 +0000 (17:39 +0300)
committerpkanavos <pkanavos@gmail.com>
Tue, 15 May 2012 14:39:11 +0000 (17:39 +0300)
Conflicts:
trunk/Pithos.Core/Agents/FileAgent.cs

1  2 
trunk/Pithos.Core/Agents/FileAgent.cs patch | diff1 | diff2 | blob | history

diff --cc trunk/Pithos.Core/Agents/FileAgent.cs
Simple merge
Unnamed repository; edit this file 'description' to name the repository.