[MERGE]Trunk.

bzr revid: vme@tinyerp.com-20140505043233-2t2e2vb1yv86hyxp

3 files changed, 0 insertions, 31 deletions

diff --git a/addons/web_hello/__init__.py b/addons/web_hello/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/addons/web_hello/__init__.py
+++ /dev/null
diff --git a/addons/web_hello/__openerp__.py b/addons/web_hello/__openerp__.py
deleted file mode 100644
index 5d8a4baf597..00000000000
--- a/addons/web_hello/__openerp__.py
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    'name': 'Hello',
-    'category': 'Hidden',
-    'description':"""
-OpenERP Web example module.
-===========================
-
-""",
-    'version': '2.0',
-    'depends': [],
-    'js': ['static/*/*.js', 'static/*/js/*.js'],
-    'css': [],
-    'auto_install': False,
-    'web_preload': False,
-}
diff --git a/addons/web_hello/static/openerp/base_hello.js b/addons/web_hello/static/openerp/base_hello.js
deleted file mode 100644
index 2043af6d4ea..00000000000
--- a/addons/web_hello/static/openerp/base_hello.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/*---------------------------------------------------------
- * OpenERP base_hello (Example module)
- *---------------------------------------------------------*/
-
-openerp.web_hello = function(instance) {
-
-instance.web.SearchView = instance.web.SearchView.extend({
-    init:function() {
-        this._super.apply(this,arguments);
-        this.on('search_data', this, function(){console.log('hello');});
-    }
-});
-
-};
-
-// vim:et fdc=0 fdl=0: