git://git.onelab.eu / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 400a308 ac13cdd)
Merge branch 'lxc_devel' of ssh://git.planet-lab.org/git/build into lxc_devel
authorMarco Yuen <marcoy@gmail.com>
Wed, 21 Dec 2011 16:22:40 +0000 (11:22 -0500)
committerMarco Yuen <marcoy@gmail.com>
Wed, 21 Dec 2011 16:22:40 +0000 (11:22 -0500)
1  2 
config.planetlab/bootstrapfs.pkgs patch | diff1 | diff2 | blob | history

diff --cc config.planetlab/bootstrapfs.pkgs
Simple merge
build