avro-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cutt...@apache.org
Subject svn commit: r1087795 - in /avro/branches/branch-1.5: ./ lang/csharp/Avro.sln
Date Fri, 01 Apr 2011 16:41:21 GMT
Author: cutting
Date: Fri Apr  1 16:41:20 2011
New Revision: 1087795

URL: http://svn.apache.org/viewvc?rev=1087795&view=rev
Log:
Merge -c 1087792 trunk from trunk to 1.5 branch.  Fixes: AVRO-533.

Modified:
    avro/branches/branch-1.5/   (props changed)
    avro/branches/branch-1.5/lang/csharp/Avro.sln

Propchange: avro/branches/branch-1.5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr  1 16:41:20 2011
@@ -1 +1 @@
-/avro/trunk:1075938,1075993,1078917,1079055,1079060,1079063,1083246,1085921,1086727,1086730,1086866,1087076,1087129,1087136,1087439-1087440,1087463,1087472
+/avro/trunk:1075938,1075993,1078917,1079055,1079060,1079063,1083246,1085921,1086727,1086730,1086866,1087076,1087129,1087136,1087439-1087440,1087463,1087472,1087792

Modified: avro/branches/branch-1.5/lang/csharp/Avro.sln
URL: http://svn.apache.org/viewvc/avro/branches/branch-1.5/lang/csharp/Avro.sln?rev=1087795&r1=1087794&r2=1087795&view=diff
==============================================================================
--- avro/branches/branch-1.5/lang/csharp/Avro.sln (original)
+++ avro/branches/branch-1.5/lang/csharp/Avro.sln Fri Apr  1 16:41:20 2011
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-lang/csharp/Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avro.main", "src\apache\main\Avro.main.csproj",
"{A0A5CA3C-F58C-4D07-98B0-2C7B62AB20F0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avro.main", "src\apache\main\Avro.main.csproj",
"{A0A5CA3C-F58C-4D07-98B0-2C7B62AB20F0}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avro.test", "src\apache\test\Avro.test.csproj",
"{911D56AB-587B-4E5F-B5EA-D47D8A46F1FA}"
 EndProject



Mime
View raw message