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: 5f93357 6fca3ad)

author	Frédéric Marchal <fmarchal@users.sourceforge.net>
	Fri, 1 Jun 2012 18:50:04 +0000 (20:50 +0200)
committer	Frédéric Marchal <fmarchal@users.sourceforge.net>
	Fri, 1 Jun 2012 18:50:04 +0000 (20:50 +0200)
commit	1bf79dab6b8e76c4e2de820687017e8377cfa0a8
tree	1051a5aadbad2ef282e2fa8f864cb3c8bd11a06b	tree \| snapshot
parent	5f933573a825acedcab3ee6145ea73fa5062764b	commit \| diff
parent	6fca3ad9aa82eb4efa839f42da64dc80e2645a3d	commit \| diff

Merge commit '6fca3ad9aa82eb4efa839f4'

Conflicts:
CMakeLists.txt
configure.in

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.