[MERGE]Trunk.

bzr revid: vme@tinyerp.com-20130823050602-33bqv07e7g8dhv7x

1 files changed, 0 insertions, 41 deletions

diff --git a/addons/google_docs/__openerp__.py b/addons/google_docs/__openerp__.py
deleted file mode 100644
index 2d064fdb8a9..00000000000
--- a/addons/google_docs/__openerp__.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-{
-    'name': 'Google Docs integration',
-    'version': '0.2',
-    'author': 'OpenERP SA',
-    'website': 'http://openerp.com',
-    'category': 'Tools',
-    'installable': True,
-    'auto_install': False,
-    'js': ['static/src/js/gdocs.js'],
-    'qweb': ['static/src/xml/gdocs.xml'],
-    'data': [
-        'security/ir.model.access.csv',
-        'res_config_user_view.xml'
-    ],
-    'depends': ['google_base_account','document'],
-    'description': """
-Module to attach a google document to any model.
-================================================
-"""
-}