projects / pithos-ms-client / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 59e2be8 dd0f936)
Merge branch 'master' of https://code.grnet.gr/git/pithos-ms-client
authorpkanavos <pkanavos@gmail.com>
Thu, 29 Mar 2012 22:05:10 +0000 (01:05 +0300)
committerpkanavos <pkanavos@gmail.com>
Thu, 29 Mar 2012 22:06:02 +0000 (01:06 +0300)
commit5ac320891810e88f88d073a9b50089be203d69d0
tree9d0e5025e287d63a99095a8d78948978514c6b37tree | snapshot
parent59e2be82282f5993a3d354ee84e3a71e1177d086commit | diff
parentdd0f9366396d8e01262da2e93a65569d6bbcad47commit | diff
Merge branch 'master' of https://code.grnet.gr/git/pithos-ms-client

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

Replaced v 1.0.66 of SQLite with v. 1.0.79 specific for .NET 4.0
20 files changed:
trunk/Libraries/32/System.Data.SQLite.dll blob1 | blob2 | history
trunk/Libraries/64/System.Data.SQLite.dll blob1 | blob2 | history
trunk/Pithos.Client.WPF/Pithos.Client.WPF.csproj diff1 | diff2 | blob | history
trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs diff1 | diff2 | blob | history
trunk/Pithos.Client.WPF/app.config diff1 | diff2 | blob | history
trunk/Pithos.Client.WPF/packages.config diff1 | diff2 | blob | history
trunk/Pithos.Core/Agents/BlockExtensions.cs diff1 | diff2 | blob | history
trunk/Pithos.Core/Pithos.Core.csproj diff1 | diff2 | blob | history
trunk/Pithos.Core/packages.config diff1 | diff2 | blob | history
trunk/Pithos.Network/RestClient.cs diff1 | diff2 | blob | history
trunk/packages/System.Data.SQLite.1.0.66.1/System.Data.SQLite.1.0.66.1.nupkg blob1 | blob2 | history
trunk/packages/System.Data.SQLite.1.0.66.1/content/app.config.transform blob1 | blob2 | history
trunk/packages/System.Data.SQLite.1.0.66.1/content/web.config.transform blob1 | blob2 | history
trunk/packages/System.Data.SQLite.1.0.66.1/lib/System.Data.SQLite.DLL blob1 | blob2 | history
trunk/packages/System.Data.SQLite.1.0.66.1/tools/readme.txt blob1 | blob2 | history
trunk/packages/System.Data.SQLite.1.0.79.0/System.Data.SQLite.1.0.79.0.nupkg | | blob
trunk/packages/System.Data.SQLite.1.0.79.0/lib/net20/System.Data.SQLite.Linq.dll diff1 | diff2 | blob | history
trunk/packages/System.Data.SQLite.1.0.79.0/lib/net20/System.Data.SQLite.dll | | blob
trunk/packages/System.Data.SQLite.1.0.79.0/lib/net40/System.Data.SQLite.Linq.dll diff1 | diff2 | blob | history
trunk/packages/System.Data.SQLite.1.0.79.0/lib/net40/System.Data.SQLite.dll | | blob
Unnamed repository; edit this file 'description' to name the repository.