P. Christeas 8220e0ad02 Merge commit 'origin/master' into mdv-gpl3 ... Conflicts: bin/tools/convert.py bzr revid: p_christ@hol.gr-20081025224421-g367ati5b2eeplw6 bzr revid: p_christ@hol.gr-20081104201238-oy0vgsunt2jxgu2p		2008-11-04 22:12:38 +02:00
addons	modifs	2008-09-23 00:46:01 +02:00
bin	Merge commit 'origin/master' into mdv-gpl3	2008-11-04 22:12:38 +02:00
doc	Merge commit 'origin/master' into mdv-gpl3	2008-11-04 22:12:38 +02:00
man	Rename Tiny ERP to OpenERP	2008-09-10 10:46:40 +02:00
pixmaps	Use the new icon (temp)	2008-11-03 12:16:02 -05:00
win32	passing in GPL-3	2008-11-03 19:27:16 +01:00
MANIFEST.in	Add csv file to tgz	2007-08-16 06:57:33 +00:00
openerp-server-installer.nsi	Remove the version in the name	2008-11-03 13:37:17 -05:00
setup.py	passing in GPL-3	2008-11-03 19:27:16 +01:00