Bastard crashed on me... and I despise windows line endings... I really do!

agoransson · agoransson · commit 6d3221b5322c · 2012-02-21T11:30:16.000+01:00
diff --git a/distribution/json4processing-0.1.2/download/json4processing-0.1.2.zip b/distribution/json4processing-0.1.2/download/json4processing-0.1.2.zip
diff --git a/distribution/json4processing-0.1.2/examples/create_jsonobject/create_jsonobject.pde b/distribution/json4processing-0.1.2/examples/create_jsonobject/create_jsonobject.pde
@@ -14,7 +14,7 @@ void setup(){
   
   // 2. Add some content to the object
   myJsonObject.put( "myIntegerValue", 7 );
-  
+
   println( myJsonObject );
 }
 
diff --git a/distribution/json4processing-0.1.2/examples/reading_yahoo_weather/reading_yahoo_weather.pde b/distribution/json4processing-0.1.2/examples/reading_yahoo_weather/reading_yahoo_weather.pde
diff --git a/distribution/json4processing-0.1.2/reference/allclasses-frame.html b/distribution/json4processing-0.1.2/reference/allclasses-frame.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_30) on Tue Feb 21 10:55:26 CET 2012 -->
+<!-- Generated by javadoc (build 1.6.0_30) on Tue Feb 21 11:27:27 CET 2012 -->
 <TITLE>
 All Classes (Javadocs: json4processing)
 </TITLE>
diff --git a/distribution/json4processing-0.1.2/reference/allclasses-noframe.html b/distribution/json4processing-0.1.2/reference/allclasses-noframe.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_30) on Tue Feb 21 10:55:26 CET 2012 -->
+<!-- Generated by javadoc (build 1.6.0_30) on Tue Feb 21 11:27:27 CET 2012 -->
 <TITLE>
 All Classes (Javadocs: json4processing)
 </TITLE>
diff --git a/distribution/json4processing-0.1.2/reference/constant-values.html b/distribution/json4processing-0.1.2/reference/constant-values.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_30) on Tue Feb 21 10:55:26 CET 2012 -->
+<!-- Generated by javadoc (build 1.6.0_30) on Tue Feb 21 11:27:27 CET 2012 -->
 <TITLE>
 Constant Field Values (Javadocs: json4processing)
 </TITLE>
diff --git a/distribution/json4processing-0.1.2/reference/deprecated-list.html b/distribution/json4processing-0.1.2/reference/deprecated-list.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_30) on Tue Feb 21 10:55:26 CET 2012 -->
+<!-- Generated by javadoc (build 1.6.0_30) on Tue Feb 21 11:27:27 CET 2012 -->
 <TITLE>
 Deprecated List (Javadocs: json4processing)
 </TITLE>
diff --git a/distribution/json4processing-0.1.2/reference/help-doc.html b/distribution/json4processing-0.1.2/reference/help-doc.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_30) on Tue Feb 21 10:55:26 CET 2012 -->
+<!-- Generated by javadoc (build 1.6.0_30) on Tue Feb 21 11:27:27 CET 2012 -->
 <TITLE>
 API Help (Javadocs: json4processing)
 </TITLE>
diff --git a/distribution/json4processing-0.1.2/reference/index-all.html b/distribution/json4processing-0.1.2/reference/index-all.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_30) on Tue Feb 21 10:55:26 CET 2012 -->
+<!-- Generated by javadoc (build 1.6.0_30) on Tue Feb 21 11:27:27 CET 2012 -->
 <TITLE>
 Index (Javadocs: json4processing)
 </TITLE>
diff --git a/distribution/json4processing-0.1.2/reference/index.html b/distribution/json4processing-0.1.2/reference/index.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc on Tue Feb 21 10:55:26 CET 2012-->
+<!-- Generated by javadoc on Tue Feb 21 11:27:27 CET 2012-->
 <TITLE>
 Javadocs: json4processing
 </TITLE>
diff --git a/distribution/json4processing-0.1.2/reference/org/json/CDL.html b/distribution/json4processing-0.1.2/reference/org/json/CDL.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_30) on Tue Feb 21 10:55:25 CET 2012 -->
+<!-- Generated by javadoc (build 1.6.0_30) on Tue Feb 21 11:27:27 CET 2012 -->
 <TITLE>
 CDL (Javadocs: json4processing)
 </TITLE>
diff --git a/distribution/json4processing-0.1.2/reference/org/json/Cookie.html b/distribution/json4processing-0.1.2/reference/org/json/Cookie.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_30) on Tue Feb 21 10:55:26 CET 2012 -->
+<!-- Generated by javadoc (build 1.6.0_30) on Tue Feb 21 11:27:27 CET 2012 -->
 <TITLE>
 Cookie (Javadocs: json4processing)
 </TITLE>
diff --git a/distribution/json4processing-0.1.2/reference/org/json/CookieList.html b/distribution/json4processing-0.1.2/reference/org/json/CookieList.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_30) on Tue Feb 21 10:55:26 CET 2012 -->
+<!-- Generated by javadoc (build 1.6.0_30) on Tue Feb 21 11:27:27 CET 2012 -->
 <TITLE>
 CookieList (Javadocs: json4processing)
 </TITLE>
diff --git a/distribution/json4processing-0.1.2/reference/org/json/HTTP.html b/distribution/json4processing-0.1.2/reference/org/json/HTTP.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_30) on Tue Feb 21 10:55:26 CET 2012 -->
+<!-- Generated by javadoc (build 1.6.0_30) on Tue Feb 21 11:27:27 CET 2012 -->
 <TITLE>
 HTTP (Javadocs: json4processing)
 </TITLE>
diff --git a/distribution/json4processing-0.1.2/reference/org/json/HTTPTokener.html b/distribution/json4processing-0.1.2/reference/org/json/HTTPTokener.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_30) on Tue Feb 21 10:55:26 CET 2012 -->
+<!-- Generated by javadoc (build 1.6.0_30) on Tue Feb 21 11:27:27 CET 2012 -->
 <TITLE>
 HTTPTokener (Javadocs: json4processing)
 </TITLE>
diff --git a/distribution/json4processing-0.1.2/reference/org/json/JSONArray.html b/distribution/json4processing-0.1.2/reference/org/json/JSONArray.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_30) on Tue Feb 21 10:55:26 CET 2012 -->
+<!-- Generated by javadoc (build 1.6.0_30) on Tue Feb 21 11:27:27 CET 2012 -->
 <TITLE>
 JSONArray (Javadocs: json4processing)
 </TITLE>
diff --git a/distribution/json4processing-0.1.2/reference/org/json/JSONException.html b/distribution/json4processing-0.1.2/reference/org/json/JSONException.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_30) on Tue Feb 21 10:55:26 CET 2012 -->
+<!-- Generated by javadoc (build 1.6.0_30) on Tue Feb 21 11:27:27 CET 2012 -->
 <TITLE>
 JSONException (Javadocs: json4processing)
 </TITLE>
diff --git a/distribution/json4processing-0.1.2/reference/org/json/JSONML.html b/distribution/json4processing-0.1.2/reference/org/json/JSONML.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_30) on Tue Feb 21 10:55:26 CET 2012 -->
+<!-- Generated by javadoc (build 1.6.0_30) on Tue Feb 21 11:27:27 CET 2012 -->
 <TITLE>
 JSONML (Javadocs: json4processing)
 </TITLE>
diff --git a/distribution/json4processing-0.1.2/reference/org/json/JSONObject.html b/distribution/json4processing-0.1.2/reference/org/json/JSONObject.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_30) on Tue Feb 21 10:55:26 CET 2012 -->
+<!-- Generated by javadoc (build 1.6.0_30) on Tue Feb 21 11:27:27 CET 2012 -->
 <TITLE>
 JSONObject (Javadocs: json4processing)
 </TITLE>
diff --git a/distribution/json4processing-0.1.2/reference/org/json/JSONString.html b/distribution/json4processing-0.1.2/reference/org/json/JSONString.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_30) on Tue Feb 21 10:55:26 CET 2012 -->
+<!-- Generated by javadoc (build 1.6.0_30) on Tue Feb 21 11:27:27 CET 2012 -->
 <TITLE>
 JSONString (Javadocs: json4processing)
 </TITLE>
diff --git a/distribution/json4processing-0.1.2/reference/org/json/JSONStringer.html b/distribution/json4processing-0.1.2/reference/org/json/JSONStringer.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_30) on Tue Feb 21 10:55:26 CET 2012 -->
+<!-- Generated by javadoc (build 1.6.0_30) on Tue Feb 21 11:27:27 CET 2012 -->
 <TITLE>
 JSONStringer (Javadocs: json4processing)
 </TITLE>
diff --git a/distribution/json4processing-0.1.2/reference/org/json/JSONTokener.html b/distribution/json4processing-0.1.2/reference/org/json/JSONTokener.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_30) on Tue Feb 21 10:55:26 CET 2012 -->
+<!-- Generated by javadoc (build 1.6.0_30) on Tue Feb 21 11:27:27 CET 2012 -->
 <TITLE>
 JSONTokener (Javadocs: json4processing)
 </TITLE>
diff --git a/distribution/json4processing-0.1.2/reference/org/json/JSONWriter.html b/distribution/json4processing-0.1.2/reference/org/json/JSONWriter.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_30) on Tue Feb 21 10:55:26 CET 2012 -->
+<!-- Generated by javadoc (build 1.6.0_30) on Tue Feb 21 11:27:27 CET 2012 -->
 <TITLE>
 JSONWriter (Javadocs: json4processing)
 </TITLE>
diff --git a/distribution/json4processing-0.1.2/reference/org/json/XML.html b/distribution/json4processing-0.1.2/reference/org/json/XML.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_30) on Tue Feb 21 10:55:26 CET 2012 -->
+<!-- Generated by javadoc (build 1.6.0_30) on Tue Feb 21 11:27:27 CET 2012 -->
 <TITLE>
 XML (Javadocs: json4processing)
 </TITLE>
diff --git a/distribution/json4processing-0.1.2/reference/org/json/XMLTokener.html b/distribution/json4processing-0.1.2/reference/org/json/XMLTokener.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_30) on Tue Feb 21 10:55:26 CET 2012 -->
+<!-- Generated by javadoc (build 1.6.0_30) on Tue Feb 21 11:27:27 CET 2012 -->
 <TITLE>
 XMLTokener (Javadocs: json4processing)
 </TITLE>
diff --git a/distribution/json4processing-0.1.2/reference/org/json/package-frame.html b/distribution/json4processing-0.1.2/reference/org/json/package-frame.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_30) on Tue Feb 21 10:55:26 CET 2012 -->
+<!-- Generated by javadoc (build 1.6.0_30) on Tue Feb 21 11:27:27 CET 2012 -->
 <TITLE>
 org.json (Javadocs: json4processing)
 </TITLE>
diff --git a/distribution/json4processing-0.1.2/reference/org/json/package-summary.html b/distribution/json4processing-0.1.2/reference/org/json/package-summary.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_30) on Tue Feb 21 10:55:26 CET 2012 -->
+<!-- Generated by javadoc (build 1.6.0_30) on Tue Feb 21 11:27:27 CET 2012 -->
 <TITLE>
 org.json (Javadocs: json4processing)
 </TITLE>
diff --git a/distribution/json4processing-0.1.2/reference/org/json/package-tree.html b/distribution/json4processing-0.1.2/reference/org/json/package-tree.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_30) on Tue Feb 21 10:55:26 CET 2012 -->
+<!-- Generated by javadoc (build 1.6.0_30) on Tue Feb 21 11:27:27 CET 2012 -->
 <TITLE>
 org.json Class Hierarchy (Javadocs: json4processing)
 </TITLE>
diff --git a/distribution/json4processing-0.1.2/reference/overview-tree.html b/distribution/json4processing-0.1.2/reference/overview-tree.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_30) on Tue Feb 21 10:55:26 CET 2012 -->
+<!-- Generated by javadoc (build 1.6.0_30) on Tue Feb 21 11:27:27 CET 2012 -->
 <TITLE>
 Class Hierarchy (Javadocs: json4processing)
 </TITLE>
diff --git a/distribution/json4processing-0.1.2/reference/serialized-form.html b/distribution/json4processing-0.1.2/reference/serialized-form.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_30) on Tue Feb 21 10:55:26 CET 2012 -->
+<!-- Generated by javadoc (build 1.6.0_30) on Tue Feb 21 11:27:27 CET 2012 -->
 <TITLE>
 Serialized Form (Javadocs: json4processing)
 </TITLE>
diff --git a/examples/create_jsonobject/create_jsonobject.pde b/examples/create_jsonobject/create_jsonobject.pde
@@ -1,11 +1,8 @@
 /*
  * JSON 4 Processing
  * Basic example 1: Creating a JSON Object
-<<<<<<< HEAD
  *
  * Good for sending values that has a specific meaning (complex values)
-=======
->>>>>>> origin/HEAD
  */
 
 import org.json.*;
@@ -17,11 +14,8 @@ void setup(){
   
   // 2. Add some content to the object
   myJsonObject.put( "myIntegerValue", 7 );
-<<<<<<< HEAD
-  
+
   println( myJsonObject );
-=======
->>>>>>> origin/HEAD
 }
 
 void draw(){
diff --git a/examples/reading_yahoo_weather/reading_yahoo_weather.pde b/examples/reading_yahoo_weather/reading_yahoo_weather.pde
diff --git a/src/org/json/CDL.java b/src/org/json/CDL.java
diff --git a/src/org/json/Cookie.java b/src/org/json/Cookie.java
diff --git a/src/org/json/CookieList.java b/src/org/json/CookieList.java
diff --git a/src/org/json/HTTP.java b/src/org/json/HTTP.java
diff --git a/src/org/json/HTTPTokener.java b/src/org/json/HTTPTokener.java
diff --git a/src/org/json/JSONException.java b/src/org/json/JSONException.java
diff --git a/src/org/json/JSONString.java b/src/org/json/JSONString.java
diff --git a/src/org/json/JSONStringer.java b/src/org/json/JSONStringer.java
diff --git a/src/org/json/JSONWriter.java b/src/org/json/JSONWriter.java
diff --git a/src/org/json/XMLTokener.java b/src/org/json/XMLTokener.java

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ void setup(){`
`14`	`14`
`15`	`15`	`// 2. Add some content to the object`
`16`	`16`	`myJsonObject.put( "myIntegerValue", 7 );`
`17`		`-`
	`17`	`+`
`18`	`18`	`println( myJsonObject );`
`19`	`19`	`}`
`20`	`20`