summary refs log tree commit diff
path: root/Makefile
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2011-06-13 22:02:02 +0000
committerLars Hjemli <hjemli@gmail.com>2011-06-13 22:02:02 +0000
commit859d106d5e8d884bf8f25b2ceea8600b2987c387 (patch)
tree6e9d5d910f175aefa1f337e431a33e7657ac4259 /Makefile
parentbe6991c1e42d548848bf2f51fd9910d14b5bdf40 (diff)
parentef13e5eafe16474bb5b3c3b8156bbb24a9249b2e (diff)
Merge branch 'stable'
Conflicts:
	cgitrc.5.txt
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions