chiark / gitweb /
~ianmdlvl / marlin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c41dbdb 7cefe28)
Merge branch 'for-upstream-ff' into iwj
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 1 Aug 2012 20:42:11 +0000 (21:42 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 1 Aug 2012 20:42:11 +0000 (21:42 +0100)
1  2 
Marlin/Makefile patch | diff1 | diff2 | blob | history

diff --cc Marlin/Makefile
Simple merge
Unnamed repository; edit this file 'description' to name the repository.