diff options
author | Merov Linden <merov@lindenlab.com> | 2011-03-18 16:23:55 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2011-03-18 16:23:55 -0700 |
commit | 9923f403226d6c014cb40149c2e31b2fce988803 (patch) | |
tree | 7030df4ad63f8569db62120a4b490794c467fa0f /autobuild.xml | |
parent | bfeaae9ea74d04ce999a7092856619db6711215d (diff) |
Autobuild : fixed merge errors in json hash codes
Diffstat (limited to 'autobuild.xml')
-rw-r--r-- | autobuild.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/autobuild.xml b/autobuild.xml index c26afea6f3..108e6dc429 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -870,7 +870,7 @@ <key>archive</key> <map> <key>hash</key> - <string>22c2ab6ef046c0c1f6cf674297f3e8ef</string> + <string>de8b96120c274e052abb4f692861be46</string> <key>url</key> <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jsoncpp-0.5.0-darwin-20110131.tar.bz2</string> </map> @@ -894,7 +894,7 @@ <key>archive</key> <map> <key>hash</key> - <string>0959e349c4f7c0b33539269502486737</string> + <string>afff2018e6a887c281b072eecdd9343e</string> <key>url</key> <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jsoncpp-0.5.0-windows-20110208.tar.bz2</string> </map> |