[MERGE] merge with latest trunk

bzr revid: amb@tinyerp.com-20130528085853-33ak0wen7shv6af2

1 files changed, 0 insertions, 18 deletions

diff --git a/addons/web/doc/module/static/src/js/first_module.js.3.diff b/addons/web/doc/module/static/src/js/first_module.js.3.diff
deleted file mode 100644
index 295e90b6840..00000000000
--- a/addons/web/doc/module/static/src/js/first_module.js.3.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- web_example/static/src/js/first_module.js
-+++ web_example/static/src/js/first_module.js
-@@ -1,7 +1,11 @@
- // 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 = function (parent, action) {
--        console.log("Executed the action", action);
--    };
-+    instance.web.client_actions.add('example.action', 'instance.web_example.Action');
-+    instance.web_example.Action = instance.web.Widget.extend({
-+        className: 'oe_web_example',
-+        start: function () {
-+            this.$el.text("Hello, world!");
-+            return this._super();
-+        }
-+    });
- };