]> git.ipfire.org Git - thirdparty/sarg.git/commitdiff
projects / thirdparty / sarg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4b3ad22 d82e811)
Merge commit 'd82e81174c6b544f0718736c5'
authorFrédéric Marchal <fmarchal@users.sourceforge.net>
Fri, 1 Jun 2012 18:23:32 +0000 (20:23 +0200)
committerFrédéric Marchal <fmarchal@users.sourceforge.net>
Fri, 1 Jun 2012 18:23:32 +0000 (20:23 +0200)
Conflicts:
CMakeLists.txt
ChangeLog
configure.in
include/info.h
useragent.c


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