git.inspyration.org Git - odoo/odoo.git/commit

author	Antony Lesuisse <al@openerp.com>
	Sun, 11 Nov 2012 02:10:22 +0000 (03:10 +0100)
committer	Antony Lesuisse <al@openerp.com>
	Sun, 11 Nov 2012 02:10:22 +0000 (03:10 +0100)
commit	4820450aef943e25aedc7e767e39f08cdadd8f18
tree	9bc436788f17f60580754ecdb769e6be81c3fd6b	tree \| snapshot
parent	cb66985c9ba042841f8851f16e554500a4461c3e	commit \| diff

merge trunk fixes

bzr revid: al@openerp.com-20121111021022-jppw87f7l42shlwn

25 files changed:

doc/01_getting_started.rst		diff \| blob \| history
doc/04_security.rst	[new file with mode: 0644]	blob
doc/04_user_roles.rst	[deleted file]	blob \| history
doc/05_test_framework.rst	[new file with mode: 0644]	blob
doc/99_test_framework.rst	[deleted file]	blob \| history
doc/api/core.rst	[deleted file]	blob \| history
doc/api/field_level_acl.rst	[deleted file]	blob \| history
doc/api/models.rst	[deleted file]	blob \| history
doc/api/startup.rst	[deleted file]	blob \| history
doc/api_core.rst	[new file with mode: 0644]	blob
doc/api_models.rst	[new file with mode: 0644]	blob
doc/field_level_acl.rst	[new file with mode: 0644]	blob
doc/font_style.rst	[new file with mode: 0644]	blob
doc/import.rst		diff \| blob \| history
doc/import_o2m.txt	[new file with mode: 0644]	blob
doc/index.rst		diff \| blob \| history
doc/index.rst.inc	[deleted file]	blob \| history
doc/list_font_style.rst	[new file with mode: 0644]	blob
doc/need_action_specs.rst	[new file with mode: 0644]	blob
doc/o2m.txt	[deleted file]	blob \| history
doc/revisions/font_style.rst	[deleted file]	blob \| history
doc/revisions/need_action_specs.rst	[deleted file]	blob \| history
doc/revisions/user_img_specs.rst	[deleted file]	blob \| history
doc/startup.rst	[new file with mode: 0644]	blob
doc/user_img_specs.rst	[new file with mode: 0644]	blob

Unnamed repository; edit this file 'description' to name the repository.