[Merge]Merge with trunk

bzr revid: vja@tinyerp.com-20130501054129-2ie8kj73yosxbfo8

1 files changed, 0 insertions, 15 deletions

diff --git a/addons/web/doc/module/static/src/js/first_module.js.4.diff b/addons/web/doc/module/static/src/js/first_module.js.4.diff
deleted file mode 100644
index 78a192147e6..00000000000
--- a/addons/web/doc/module/static/src/js/first_module.js.4.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- web_example/static/src/js/first_module.js
-+++ web_example/static/src/js/first_module.js
-@@ -1,11 +1,7 @@
- // static/src/js/first_module.js
- openerp.web_example = function (instance) {
-     instance.web.client_actions.add('example.action', 'instance.web_example.Action');
-     instance.web_example.Action = instance.web.Widget.extend({
-+        template: 'web_example.action'
--        className: 'oe_web_example',
--        start: function () {
--            this.$el.text("Hello, world!");
--            return this._super();
--        }
-     });
- };