git://git.onelab.eu / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fd4dad6 6cb2b1f)
Merge commit 'origin/master'
authorroot <root@cassidy.cs.princeton.edu>
Thu, 2 Dec 2010 23:20:26 +0000 (18:20 -0500)
committerroot <root@cassidy.cs.princeton.edu>
Thu, 2 Dec 2010 23:20:26 +0000 (18:20 -0500)
1  2 
onelab-tags.mk patch | diff1 | diff2 | blob | history

diff --cc onelab-tags.mk
Simple merge
build