Merge branch 'master' of git@91.121.22.72:laditools

lib/laditools/__init__.py

@@ -19,7 +19,7 @@ from jack_configure import jack_configure
 from ladimenu import manager, find_data_file
 from a2j_controller import a2j_controller
 from a2j_menu import a2j_menu
-from lash_controller import ladish_proxy
+from ladish_controller import ladish_proxy
 # from error import error
 from config import config
 from TreeViewTooltips import TreeViewTooltips

lib/laditools/ladimenu.py

@@ -25,7 +25,7 @@ from config import config
 from jack_configure import jack_configure
 from jack_controller import jack_controller
 from a2j_controller import a2j_controller
-from lash_controller import ladish_proxy
+from ladish_controller import ladish_proxy
 
 # TODO : somehow, we need stock icons. Nothing else can be used for ImageMenuItems