git://git.onelab.eu / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 616f130 afaa75e)
Merge branch 'master' into lxc_devel
authorMarco Yuen <marcoy@cs.princeton.edu>
Mon, 16 Jan 2012 16:29:54 +0000 (11:29 -0500)
committerMarco Yuen <marcoy@cs.princeton.edu>
Mon, 16 Jan 2012 16:29:54 +0000 (11:29 -0500)
1  2 
onelab-k32-tags.mk patch | diff1 | diff2 | blob | history
planetlab-k32-tags.mk patch | diff1 | diff2 | blob | history

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