# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: address@hidden
# target_branch: http://bzr.savannah.gnu.org/r/librejs/dev/
# testament_sha1: 69c10f1754ab699250719724503bb34ceec10c76
# timestamp: 2014-12-01 10:07:55 +0100
# base_revision_id: address@hidden
# 
# Begin patch
=== modified file 'data/script_libraries/gethash.sh'
--- data/script_libraries/gethash.sh	2014-08-20 02:31:59 +0000
+++ data/script_libraries/gethash.sh	2014-12-01 09:04:38 +0000
@@ -3,8 +3,22 @@
 # gethash.sh
 #
 # Get the hash of a js file for use in the librejs database.
-#
-
-FILE=$1
-wget -O /tmp/jsfile $FILE
-iconv -f LATIN1 -t UTF8 /tmp/jsfile | sha1sum
+# Output a JSON object to be included in script-libraries.json
+
+url=$1
+t=$(mktemp)
+wget --quiet -O $t $url
+if [ $? -ne 0 ]
+then
+    echo $url not found
+    exit 1
+fi
+s=$(iconv -f LATIN1 -t UTF8 $t | sha1sum | awk '{print $1}')
+cat <<EOF
+    "$s": {
+        "filename": "$url",
+        "result": "[freelib"]
+    }
+EOF
+
+rm -f $t

=== modified file 'data/script_libraries/script-libraries.json'
--- data/script_libraries/script-libraries.json	2014-08-20 04:08:53 +0000
+++ data/script_libraries/script-libraries.json	2014-12-01 09:04:38 +0000
@@ -332,6 +332,14 @@
         "result": "[freelib]"
     },
 
+    "0b327b43256da9f57b78e3134aaecc2a4a5a3bad": {
+        "filename": "https://ajax.googleapis.com/ajax/libs/jqueryui/1.11.1/jquery-ui.js",
+        "result": "[freelib]",
+    }
+    "01100f829bce3f074adcb6ae5309d9e769ef29fe": {
+        "filename": "https://ajax.googleapis.com/ajax/libs/jqueryui/1.11.0/jquery-ui.js",
+        "result": "[freelib]",
+    }
     "5f99079e4564f94a1d5e45d22d6dc18acbb148da": {
         "filename": "https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.21/jquery-ui.js",
         "result": "[freelib]"
@@ -436,6 +444,14 @@
         "filename": "https://ajax.googleapis.com/ajax/libs/jqueryui/1.7.0/jquery-ui.js",
         "result": "[freelib]"
     },
+    "9927afbb31df93a76977a676a933b7e3696d61ba": {
+        "filename": "https://ajax.googleapis.com/ajax/libs/jqueryui/1.11.1/jquery-ui.min.js",
+        "result": "[freelib]"
+    },
+    "7b6f5c747c19ad6fbe28957e4318559b45d89111": {
+        "filename": "https://ajax.googleapis.com/ajax/libs/jqueryui/1.11.0/jquery-ui.min.js",
+        "result": "[freelib]"
+    },
     "429282063ca7f3bae9797d70a6f09f2e3e05458a": {
         "filename": "https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.23/jquery-ui.min.js",
         "result": "[freelib]"
@@ -1436,5 +1452,51 @@
     "fe1b87838b7328273812380d26837f58348103b0": {
         "filename": "https://raw.github.com/documentcloud/underscore/1.6.0/underscore.js",
         "result": "[freelib]"
+    },
+    "92d29762b3d85d123d593f14b113d4fb6385598f": {
+        "filename": "https://raw.github.com/documentcloud/underscore/1.7.0/underscore.js",
+        "result": "[freelib]"
+    },
+    "fb26909af4ad2a6c240b9aa4b35bb983cf4b20e4": {
+        "filename": "https://raw.github.com/documentcloud/underscore/1.7.0/underscore-min.js",
+        "result": "[freelib]"
+    },
+
+    "63a001665725b35d2bc4a6212385a746584c1a3b": {
+        "filename": "http://cdn.jsdelivr.net/jquery.fancytree/2.6.0/jquery.fancytree-all.min.js",
+        "result": "[freelib]"
+    },
+    "d6469e3aa15a6107ad5783a96e3c8fa3f5ce21ca": {
+        "filename": "http://cdn.jsdelivr.net/jquery.fancytree/2.5.0/jquery.fancytree-all.min.js",
+        "result": "[freelib]"
+    },
+    "2de56a2ec01b0aa170754bd6ed7485576f16f165": {
+        "filename": "http://cdn.jsdelivr.net/jquery.fancytree/2.4.1/jquery.fancytree-all.min.js",
+        "result": "[freelib]"
+    },
+
+    "5ada7c103fc1deabc925cc1fdbbb6e451c21fc70": {
+        "filename": "http://netdna.bootstrapcdn.com/bootstrap/3.3.1/js/bootstrap.min.js",
+        "result": "[freelib"]
+    },
+    "afa7af2bc7cbe37eeccb9b65577744c08219c5a9": {
+        "filename": "http://netdna.bootstrapcdn.com/bootstrap/3.3.1/js/bootstrap.js",
+        "result": "[freelib"]
+    },
+    "5814e91bb6276f4de8b7951c965f2f190a03978d": {
+        "filename": "http://netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js",
+        "result": "[freelib"]
+    },
+    "fd607f85d598503b24d7799722db29fec4de1ef6": {
+        "filename": "http://netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.js",
+        "result": "[freelib"]
+    },
+    "c6a8a0f02ee0ecd975226ae4b38e9660750d1f93": {
+        "filename": "http://netdna.bootstrapcdn.com/bootstrap/3.1.0/js/bootstrap.min.js",
+        "result": "[freelib"]
+    },
+    "539e456bb40d9e98244060186f5f131b1a7f4b33": {
+        "filename": "http://netdna.bootstrapcdn.com/bootstrap/3.1.0/js/bootstrap.js",
+        "result": "[freelib"]
     }
 }

# Begin bundle
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