Viewing all changes in revision 4188.
- Committer: Ronald Portier
- Date: 2012-10-23 22:36:35 UTC
- mfrom: (4185.1.318 trunk)
- Revision ID: ronald@therp.nl-20121023223635-jxph07k7y1qf6bbx
[MERGE] Merge latest code from trunk
- files added:
- doc/import.rst
- openerp/tests/addons/test_impex
- openerp/tests/addons/test_impex/tests
- openerp/tests/addons/test_uninstall
- scripts
- files removed:
- gunicorn.conf.py
- openerp/db
- files renamed:
- openerp/addons/base/ir/ir.xml => openerp/addons/base/ir/ir_actions.xml
- openerp/addons/base/res/company_icon.png => openerp/addons/base/static/src/img/company_image.png
- openerp/tiny_socket.py => openerp/service/netrpc_socket.py
- files modified:
- .bzrignore
expand all
collapse all
added
removed
openerp/addons/base/res/photo.png
openerp/addons/base/static/src/img/avatar.png
openerp/addons/base/static/src/img/avatar0.png
openerp/addons/base/static/src/img/avatar1.png
openerp/addons/base/static/src/img/avatar2.png
openerp/addons/base/static/src/img/avatar3.png
openerp/addons/base/static/src/img/avatar4.png
openerp/addons/base/static/src/img/avatar5.png
openerp/addons/base/static/src/img/avatar6.png
openerp/addons/base/static/src/img/company_image.png
