chiark - git - ianmdlvl - marlin.git/commitdiff

chiark / gitweb /

~ianmdlvl / marlin.git / commitdiff

summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1ebe7d1 09469ad)

author	ErikZalm <erik@vdzalm.eu>
	Mon, 27 Feb 2012 16:38:36 +0000 (08:38 -0800)
committer	ErikZalm <erik@vdzalm.eu>
	Mon, 27 Feb 2012 16:38:36 +0000 (08:38 -0800)

Clean up and add some trace info

		1	2
Marlin/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge

Unnamed repository; edit this file 'description' to name the repository.