wagnertech.de Git - kivitendo-erp.git/commit

projects / kivitendo-erp.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: f990718 d18df45)

author	Moritz Bunkus <m.bunkus@linet-services.de>
	Wed, 9 Feb 2011 12:58:23 +0000 (13:58 +0100)
committer	Moritz Bunkus <m.bunkus@linet-services.de>
	Wed, 9 Feb 2011 12:58:23 +0000 (13:58 +0100)
commit	3a94f4d2dd9a835d4a7007e1b999ea00b3c4e1cd
tree	56dcf7a08d8f11f094e372f30dda48ebb1a1a765	tree \| snapshot
parent	f99071832443000a5c927f30f8c6a0610d1309c8	commit \| diff
parent	d18df453f55190d4807af324725ea82a8835d7fc	commit \| diff

Merge branch 'after-262'

Conflicts:
scripts/dbupgrade2_tool.pl

DEBIAN/DEBIAN/postinst	diff1 \|	diff2 \|	blob \| history
DEBIAN/mk_erp_deb.sh	diff1 \|	diff2 \|	blob \| history
SL/DO.pm	diff1 \|	diff2 \|	blob \| history
SL/Form.pm	diff1 \|	diff2 \|	blob \| history
bin/mozilla/admin.pl	diff1 \|	diff2 \|	blob \| history
bin/mozilla/oe.pl	diff1 \|	diff2 \|	blob \| history
doc/INSTALL.texi	diff1 \|	diff2 \|	blob \| history
doc/INSTALL.txt	diff1 \|	diff2 \|	blob \| history
locale/de_DE/all	diff1 \|	diff2 \|	blob \| history
scripts/dbupgrade2_tool.pl	diff1 \|	diff2 \|	blob \| history
templates/webpages/oe/form_header.html	diff1 \|	diff2 \|	blob \| history

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