]> granicus.if.org Git - cgit/commitdiff
Merge branch 'stable'
authorLars Hjemli <hjemli@gmail.com>
Thu, 21 Jul 2011 14:27:03 +0000 (14:27 +0000)
committerLars Hjemli <hjemli@gmail.com>
Thu, 21 Jul 2011 14:27:03 +0000 (14:27 +0000)
1  2 
Makefile
html.c

diff --cc Makefile
Simple merge
diff --cc html.c
Simple merge