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: 19be4cc d5db6e9)

author	Frédéric Marchal <fmarchal@users.sourceforge.net>
	Fri, 1 Jun 2012 18:54:10 +0000 (20:54 +0200)
committer	Frédéric Marchal <fmarchal@users.sourceforge.net>
	Fri, 1 Jun 2012 18:54:10 +0000 (20:54 +0200)
commit	c589c7137b50f053ee9217dc4b0b755040e2d369
tree	9b77fef2b248fb5dcfa2cc864fe0068107c5fcba	tree \| snapshot
parent	19be4cc8023bdd31454a424f4d9a1a21d2456cea	commit \| diff
parent	d5db6e96506c29e73b39513aa4fe03a641dd3db4	commit \| diff

Merge commit 'd5db6e96506c29e73b39513a'

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.