git://git.onelab.eu / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 124a22e 4f87799)
Merge branch 'master' of ssh://git.onelab.eu/git/build
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 23 Feb 2011 20:45:50 +0000 (21:45 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 23 Feb 2011 20:45:50 +0000 (21:45 +0100)
1  2 
onelab-k22-tags.mk patch | diff1 | diff2 | blob | history
planetlab-tags.mk patch | diff1 | diff2 | blob | history

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