]> git.ipfire.org Git - thirdparty/sarg.git/commitdiff
projects / thirdparty / sarg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
Conflicts:
html.c

1  2 
include/conf.h patch | diff1 | diff2 | blob | history
include/defs.h patch | diff1 | diff2 | blob | history

diff --cc include/conf.h
Simple merge
diff --cc include/defs.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.