]> git.ipfire.org Git - thirdparty/sarg.git/commit
projects / thirdparty / sarg.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: aa6ac9f b7c0a01)
Merge branch 'master' of ssh://git.code.sf.net/p/sarg/code
authorFrederic Marchal <fmarchal@users.sourceforge.net>
Thu, 30 May 2013 08:47:52 +0000 (10:47 +0200)
committerFrederic Marchal <fmarchal@users.sourceforge.net>
Thu, 30 May 2013 08:47:52 +0000 (10:47 +0200)
commit680b5298c12d09269c1fcf188879ecc99459abb3
treeab91bf0281694047642df2816c57f6f9fa11b50atree | snapshot
parentaa6ac9f26e8828c789f8105e38b4569130ffb6d7commit | diff
parentb7c0a0109f693c93e40ee27d861003286e0afa3bcommit | diff
Merge branch 'master' of ssh://git.code.sf.net/p/sarg/code

Conflicts:
html.c
include/conf.h diff1 | diff2 | blob | history
include/defs.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.