Public Git Hosting - openerp-server.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 656d64c 8174407)

commit	7ccfb9cd8cd03abd7771948c294ff32a4f0f1fa3
author	P. Christeas <p_christ@hol.gr>
	Thu, 9 Jul 2009 18:12:53 +0000 (9 21:12 +0300)
committer	P. Christeas <p_christ@hol.gr>
	Thu, 9 Jul 2009 18:12:53 +0000 (9 21:12 +0300)
tree	d047bb020576f9729fbd62afce52d15384480c63	tree \| snapshot (tar.gz zip)
parent	656d64cf46ccaede3269991f2369ceb054ffb5db	commit \| diff
parent	8174407a30ec59dc66712ebd6973b74ec930ec93	commit \| diff

Merge origin/master into mdv-gpl3-py26

Conflicts:
bin/addons/base_setup/i18n/base_setup.pot
bin/openerp-server.py
bin/report/preprocess.py
bin/report/report_sxw.py
bin/tools/translate.py

bin/addons/__init__.py	diff1 \|	diff2 \|	blob \| history
bin/addons/base/ir/ir_actions.py	diff1 \|	diff2 \|	blob \| history
bin/addons/base/rng/view.rng	diff1 \|	diff2 \|	blob \| history
bin/import_xml.rng	diff1 \|	diff2 \|	blob \| history
bin/openerp-server.py	diff1 \|	diff2 \|	blob \| history
bin/osv/orm.py	diff1 \|	diff2 \|	blob \| history
bin/report/render/rml2pdf/trml2pdf.py	diff1 \|	diff2 \|	blob \| history
bin/report/report_sxw.py	diff1 \|	diff2 \|	blob \| history
bin/tools/convert.py	diff1 \|	diff2 \|	blob \| history
bin/tools/misc.py	diff1 \|	diff2 \|	blob \| history
bin/tools/translate.py	diff1 \|	diff2 \|	blob \| history

OpenERP Server