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: c054356 a1d5418)

author	Frédéric Marchal <fmarchal@users.sourceforge.net>
	Thu, 19 Jul 2012 15:08:25 +0000 (17:08 +0200)
committer	Frédéric Marchal <fmarchal@users.sourceforge.net>
	Thu, 19 Jul 2012 15:08:25 +0000 (17:08 +0200)
commit	9d7e7a1259eb34c66cef3abc99984adb4ca83c58
tree	21fe2d6bd461046cecc48c4574549e333d7f1b96	tree \| snapshot
parent	c054356de543403a209e7f63e23348ef1c42e998	commit \| diff
parent	a1d54181d6b64ccb6787ca074b9824ad41c548f3	commit \| diff

Merge remote branch 'origin/v2.3'

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

23 files changed:

CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
log.c	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/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.