Merge branch 'master' of github.com:processing/processing

This commit is contained in:
Ben Fry
2013-04-26 14:57:13 -04:00
15 changed files with 162 additions and 319 deletions

View File

@@ -1116,12 +1116,12 @@ public class JSONObject {
}
public JSONObject setJSONObject(String key, String value) {
public JSONObject setJSONObject(String key, JSONObject value) {
return put(key, value);
}
public JSONObject setJSONArray(String key, String value) {
public JSONObject setJSONArray(String key, JSONArray value) {
return put(key, value);
}