git.ipfire.org Git - thirdparty/sarg.git/commit

]> git.ipfire.org Git - thirdparty/sarg.git/commit

projects / thirdparty / sarg.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 5f46190 c1cb6a2)

author	Frédéric Marchal <fmarchal@users.sourceforge.net>
	Fri, 1 Jun 2012 18:52:58 +0000 (20:52 +0200)
committer	Frédéric Marchal <fmarchal@users.sourceforge.net>
	Fri, 1 Jun 2012 18:52:58 +0000 (20:52 +0200)
commit	19be4cc8023bdd31454a424f4d9a1a21d2456cea
tree	c09411adcbf1e4f8467f260e692f889693d6ef65	tree \| snapshot
parent	5f46190e0e20b982462ab90d4d17e3db73e47fba	commit \| diff
parent	c1cb6a2978a9c3b11d87f60ce4c521e49368a9b7	commit \| diff

Merge commit 'c1cb6a2978a9c3b11d87f60ce4'

Conflicts:
CMakeLists.txt
configure.in
po/fr.po
po/zh_CN.po

24 files changed:

CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
configure.in	diff1 \|	diff2 \|	blob \| history
po/bg.po	diff1 \|	diff2 \|	blob \| history
po/ca.po	diff1 \|	diff2 \|	blob \| history
po/cs.po	diff1 \|	diff2 \|	blob \| history
po/de.po	diff1 \|	diff2 \|	blob \| history
po/el.po	diff1 \|	diff2 \|	blob \| history
po/es.po	diff1 \|	diff2 \|	blob \| history
po/fr.po	diff1 \|	diff2 \|	blob \| history
po/hu.po	diff1 \|	diff2 \|	blob \| history
po/id.po	diff1 \|	diff2 \|	blob \| history
po/it.po	diff1 \|	diff2 \|	blob \| history
po/ja.po	diff1 \|	diff2 \|	blob \| history
po/lv.po	diff1 \|	diff2 \|	blob \| history
po/nl.po	diff1 \|	diff2 \|	blob \| history
po/pl.po	diff1 \|	diff2 \|	blob \| history
po/pt.po	diff1 \|	diff2 \|	blob \| history
po/ro.po	diff1 \|	diff2 \|	blob \| history
po/ru.po	diff1 \|	diff2 \|	blob \| history
po/sk.po	diff1 \|	diff2 \|	blob \| history
po/sr.po	diff1 \|	diff2 \|	blob \| history
po/tr.po	diff1 \|	diff2 \|	blob \| history
po/uk.po	diff1 \|	diff2 \|	blob \| history
po/zh_CN.po	diff1 \|	diff2 \|	blob \| history

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