summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-08-05 11:19:54 -0400
committerOz Linden <oz@lindenlab.com>2013-08-05 11:19:54 -0400
commitb75213b39ad7456d04d3e1644f2116853ead0da0 (patch)
treea41708b3577aaac5bd3b609d2b689b71ed23efe8
parent4a17569605812f10341bf980e2b4eaaa00ccf1be (diff)
open-185: remove duplicate gperftools entry in autobuild.xml
-rwxr-xr-xautobuild.xml36
-rwxr-xr-xdoc/contributions.txt1
2 files changed, 1 insertions, 36 deletions
diff --git a/autobuild.xml b/autobuild.xml
index 628d3f6883..e13536c3b3 100755
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -879,42 +879,6 @@
</map>
</map>
</map>
- <key>gperftools</key>
- <map>
- <key>license</key>
- <string>bsd</string>
- <key>license_file</key>
- <string>LICENSES/gperftools.txt</string>
- <key>name</key>
- <string>gperftools</string>
- <key>platforms</key>
- <map>
- <key>linux</key>
- <map>
- <key>archive</key>
- <map>
- <key>hash</key>
- <string>8aedfdcf670348c18a9991ae1b384a61</string>
- <key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-perftools/rev/262672/arch/Linux/installer/gperftools-2.0-linux-20120727.tar.bz2</string>
- </map>
- <key>name</key>
- <string>linux</string>
- </map>
- <key>windows</key>
- <map>
- <key>archive</key>
- <map>
- <key>hash</key>
- <string>f62841804acb91e1309603a84f3f0ce8</string>
- <key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-perftools/rev/262672/arch/CYGWIN/installer/gperftools-2.0-windows-20120727.tar.bz2</string>
- </map>
- <key>name</key>
- <string>windows</string>
- </map>
- </map>
- </map>
<key>gstreamer</key>
<map>
<key>license</key>
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 72096a0ab7..18e8ba0189 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -300,6 +300,7 @@ Christopher Organiser
Ciaran Laval
Cinder Roxley
BUG-2326
+ OPEN-185
STORM-1703
STORM-1958
STORM-1951