]> git.ipfire.org Git - thirdparty/sarg.git/commit
Merge commit '24eb624ea44bf4c82c602ce'
authorFrédéric Marchal <fmarchal@users.sourceforge.net>
Fri, 1 Jun 2012 19:05:44 +0000 (21:05 +0200)
committerFrédéric Marchal <fmarchal@users.sourceforge.net>
Fri, 1 Jun 2012 19:05:44 +0000 (21:05 +0200)
commit4c06c641358a4edeef1395c7810ac4c1825f7c6e
tree130000bcbcfa8876e768419424fc1fc2151429db
parentc589c7137b50f053ee9217dc4b0b755040e2d369
parent24eb624ea44bf4c82c602cea2195d85558787b47
Merge commit '24eb624ea44bf4c82c602ce'

Conflicts:
configure.in
CMakeLists.txt
configure.in