conflicts solved

CartoDB · Jun 3, 2014 · 680628e · 680628e
2 parents 529e6fd + 4fcf628
commit 680628e
Show file tree

Hide file tree

Showing 51 changed files with 2,194 additions and 245 deletions.
diff --git a/NEWS b/NEWS
@@ -1,7 +1,17 @@
+3.9.08 (03//06//2014)
+- New "liquid" infowindow style implemented.
+
+3.9.07 (03//06//2014)
+- Fixed exception on hover for layers without tooltip
+- Improved tooltip interaction
+- Changed cartocss library to support marker-type "rectangle"
+- Fixed setParam when there are no default params (#120)
+
 3.9.06 (25//05//2014)
 - Allowfullscreen parameter added to iframe code
   in share dialog.
 - Fixes link style in embed header
+- Enables custom legends in Torque.
 
 3.9.05 (19//05//2014)
 - Fixed tileJSON method in cdb.Tiles

diff --git a/dist/cartodb.core.js b/dist/cartodb.core.js
diff --git a/dist/cartodb.core.uncompressed.js b/dist/cartodb.core.uncompressed.js
@@ -1,5 +1,5 @@
-// version: 3.9.06
-// sha: 9771e3cf329cabba6b4682bd842749f9f4a5067a
+// version: 3.9.08
+// sha: d693bf6fc7ed94b8ba3fc7d70cf15941431cc102
 ;(function() {
   this.cartodb = {};
   var Backbone = {};
@@ -1141,7 +1141,7 @@ var Mustache;
 
     var cdb = root.cdb = {};
 
-    cdb.VERSION = '3.9.06';
+    cdb.VERSION = '3.9.08';
     cdb.DEBUG = false;
 
     cdb.CARTOCSS_VERSIONS = {
@@ -2581,6 +2581,9 @@ NamedMap.prototype = _.extend({}, Map.prototype, {
     } else {
       params = attr;
     }
+    if (!this.named_map.params) {
+      this.named_map.params = {};
+    }
     for (var k in params) {
       if (params[k] === undefined || params[k] === null) {
         delete this.named_map.params[k];