diff --git a/build.xml b/build.xml new file mode 100644 index 000000000..134a0c8ce --- /dev/null +++ b/build.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/create-javadoc.bat b/create-javadoc.bat new file mode 100644 index 000000000..1a480149f --- /dev/null +++ b/create-javadoc.bat @@ -0,0 +1 @@ +javadoc -d doc/javadoc *.java diff --git a/git-fetch-upstream.bat b/git-fetch-upstream.bat new file mode 100644 index 000000000..27f118ae2 --- /dev/null +++ b/git-fetch-upstream.bat @@ -0,0 +1,3 @@ +:: http://bradlyfeeley.com/2008/09/03/update-a-github-fork-from-the-original-repo/ +:: http://stackoverflow.com/questions/3903817/pull-new-updates-from-original-github-repository-into-forked-github-repository +git fetch upstream diff --git a/git-merge.bat b/git-merge.bat new file mode 100644 index 000000000..c7e9f58e8 --- /dev/null +++ b/git-merge.bat @@ -0,0 +1,3 @@ +:: http://bradlyfeeley.com/2008/09/03/update-a-github-fork-from-the-original-repo/ +:: http://stackoverflow.com/questions/3903817/pull-new-updates-from-original-github-repository-into-forked-github-repository +git merge upstream/master master diff --git a/git-pull-upstream-master.bat b/git-pull-upstream-master.bat new file mode 100644 index 000000000..161f9a5c5 --- /dev/null +++ b/git-pull-upstream-master.bat @@ -0,0 +1,2 @@ +:: http://stackoverflow.com/questions/3903817/pull-new-updates-from-original-github-repository-into-forked-github-repository +git pull upstream master diff --git a/git-remote-add.bat b/git-remote-add.bat new file mode 100644 index 000000000..32795853e --- /dev/null +++ b/git-remote-add.bat @@ -0,0 +1,4 @@ +:: http://bradlyfeeley.com/2008/09/03/update-a-github-fork-from-the-original-repo/ +:: http://stackoverflow.com/questions/3903817/pull-new-updates-from-original-github-repository-into-forked-github-repository +::git remote add --track master douglascrockford-JSON-java git://github.com/douglascrockford/JSON-java.git +git remote add --track master upstream git://github.com/douglascrockford/JSON-java.git diff --git a/org-json.jar b/org-json.jar new file mode 100644 index 000000000..186cc5254 Binary files /dev/null and b/org-json.jar differ