# HG changeset patch
# User rougeronj
# Date 1418208847 -3600
# Node ID f174999faf36a97280a592adf8147467042813b1
# Parent  78ca9191e2ee391cda9f45cd44e23ed8fcdb1345# Parent  93c33daf6e56570ad60bf6ea93f1fc8dadbdd010
Merge with 93c33daf6e56570ad60bf6ea93f1fc8dadbdd010

diff -r 78ca9191e2ee -r f174999faf36 .hgtags
--- a/.hgtags	Wed Dec 10 11:47:41 2014 +0100
+++ b/.hgtags	Wed Dec 10 11:54:07 2014 +0100
@@ -78,3 +78,4 @@
 a1b85604132c732e2cac932972efd5c85df008ed V03.00-alpha.01
 7f0540d0436ac9894a8f07efe57667b60e4f4297 V03.00-alpha.02
 c7ede051639b6a5885c029e0981536acb945f5bb V03.00-alpha.03
+33c56d7137045797bc199c3fbde69f9d7b12de80 V03.00-alpha.04
diff -r 78ca9191e2ee -r f174999faf36 src/hdalab/__init__.py
--- a/src/hdalab/__init__.py	Wed Dec 10 11:47:41 2014 +0100
+++ b/src/hdalab/__init__.py	Wed Dec 10 11:54:07 2014 +0100
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-VERSION = (3, 0, 0, "alpha", 3)
+VERSION = (3, 0, 0, "alpha", 4)
 
 
 def get_version():
diff -r 78ca9191e2ee -r f174999faf36 src/hdalab/static/hdalab/js/cattree.js
--- a/src/hdalab/static/hdalab/js/cattree.js	Wed Dec 10 11:47:41 2014 +0100
+++ b/src/hdalab/static/hdalab/js/cattree.js	Wed Dec 10 11:54:07 2014 +0100
@@ -37,7 +37,7 @@
             gettree(ui.item.value);
         }
     })
-    .data("autocomplete")._renderItem = function(ul, item) {
+    .data("ui-autocomplete")._renderItem = function(ul, item) {
         return $( "<li></li>" )
             .data( "item.autocomplete", item )
             .append(