Permalink
Browse files

Merge branch 'refs/heads/java-sync-20120822'

Conflicts:
	examples/Spring.RabbitQuickStart/Spring.RabbitQuickStart.2010.sln
	examples/Spring.RabbitQuickStart/src/Spring/Spring.RabbitQuickStart.Client/App.config
	examples/Spring.RabbitQuickStart/src/Spring/Spring.RabbitQuickStart.Client/Spring.RabbitQuickStart.Client.2010.csproj
	examples/Spring.RabbitQuickStart/src/Spring/Spring.RabbitQuickStart.Client/packages.config
	examples/Spring.RabbitQuickStart/src/Spring/Spring.RabbitQuickStart.Server/App.config
	examples/Spring.RabbitQuickStart/src/Spring/Spring.RabbitQuickStart.Server/Spring.RabbitQuickStart.Server.2010.csproj
	examples/Spring.RabbitQuickStart/src/Spring/Spring.RabbitQuickStart.Server/packages.config
  • Loading branch information...
2 parents 2c784d3 + bb251af commit 34b53ecfe6b8141a0721dd746aaef47f2faa390d @joefitzgerald joefitzgerald committed Nov 13, 2012
Showing 309 changed files with 447,980 additions and 17,608 deletions.
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+ <metadata>
+ <id>Common.Logging</id>
+ <version>2.1.1</version>
+ <authors>Aleksandar Seovic, Mark Pollack, Erich Eichinger, Stephen Bohlen</authors>
+ <owners>Aleksandar Seovic, Mark Pollack, Erich Eichinger, Stephen Bohlen</owners>
+ <projectUrl>http://netcommon.sourceforge.net/</projectUrl>
+ <requireLicenseAcceptance>false</requireLicenseAcceptance>
+ <description>Common.Logging library introduces a simple abstraction to allow you to select a specific logging implementation at runtime.</description>
+ </metadata>
+</package>
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+ <metadata>
+ <id>Newtonsoft.Json</id>
+ <version>4.5.10</version>
+ <title>Json.NET</title>
+ <authors>James Newton-King</authors>
+ <owners>James Newton-King</owners>
+ <licenseUrl>http://json.codeplex.com/license</licenseUrl>
+ <projectUrl>http://james.newtonking.com/projects/json-net.aspx</projectUrl>
+ <requireLicenseAcceptance>false</requireLicenseAcceptance>
+ <description>Json.NET is a popular high-performance JSON framework for .NET</description>
+ <language>en-US</language>
+ <tags>json</tags>
+ </metadata>
+</package>

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit 34b53ec

Please sign in to comment.