summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2011-04-15 14:25:57 -0600
committerXiaohong Bao <bao@lindenlab.com>2011-04-15 14:25:57 -0600
commit5a3fb5349d2a6bd9e1835abdd0ed91a54069899e (patch)
tree7a0c8fcc3707db33c5ad94886c4336f47fbd3acf
parent47d4dc301f809c830ec5f11f5ae329bdf2e901c2 (diff)
parentf9f84794726ad9a62d1f9750226cab964199fff2 (diff)
Automated merge with https://bitbucket.org/seraph/mesh-development-vs2010
-rwxr-xr-xautobuild.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/autobuild.xml b/autobuild.xml
index 93e1684481..7112d4775c 100755
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -246,9 +246,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>fb9765a9774b80e57f841dfad3438b1e</string>
+ <string>d05be8fc196e9ce7b6636b931cf13dff</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-colladadom/rev/226584/arch/Linux/installer/colladadom-2.2-linux-20110413.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-colladadom/rev/226716/arch/Linux/installer/colladadom-2.2-linux-20110415.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>