Merge branch 'master' of github.com:JamesNK/Newtonsoft.Json

Conflicts:
	Src/Newtonsoft.Json/JsonWriter.cs
This commit is contained in:
James Newton-King
2012-11-02 08:25:11 +13:00
21 changed files with 1194 additions and 255 deletions
@@ -64,8 +64,8 @@ namespace Newtonsoft.Json.Tests
[TestFixture]
public class PerformanceTests : TestFixtureBase
{
private const int Iterations = 100;
//private const int Iterations = 5000;
//private const int Iterations = 100;
private const int Iterations = 5000;
#region Data
@@ -122,8 +122,6 @@ namespace Newtonsoft.Json.Tests
TestClass test = CreateSerializationObject();
SerializeTests(test);
Deserialize();
}
private void SerializeTests(object value)