Merge branch 'lh/macros'

author Lars Hjemli <hjemli@gmail.com>

Sun, 18 Jul 2010 13:03:08 +0000 (15:03 +0200)

committer Lars Hjemli <hjemli@gmail.com>

Sun, 18 Jul 2010 13:03:08 +0000 (15:03 +0200)
author Lars Hjemli <hjemli@gmail.com>
Sun, 18 Jul 2010 13:03:08 +0000 (15:03 +0200)
committer Lars Hjemli <hjemli@gmail.com>
Sun, 18 Jul 2010 13:03:08 +0000 (15:03 +0200)
diff --cc cgit.c
Simple merge
diff --cc cgit.h
Simple merge
diff --cc shared.c
Simple merge
author	Lars Hjemli <hjemli@gmail.com>
	Sun, 18 Jul 2010 13:03:08 +0000 (15:03 +0200)
committer	Lars Hjemli <hjemli@gmail.com>
	Sun, 18 Jul 2010 13:03:08 +0000 (15:03 +0200)
		1	2
cgit.c	patch \|	diff1 \|	diff2 \|	blob \| history
cgit.h	patch \|	diff1 \|	diff2 \|	blob \| history
shared.c	patch \|	diff1 \|	diff2 \|	blob \| history