git://git.onelab.eu / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 13da49f 156620c)
Merge branch 'master' of ssh://git.onelab.eu/git/build
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 4 Oct 2011 06:59:35 +0000 (08:59 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 4 Oct 2011 06:59:35 +0000 (08:59 +0200)
1  2 
onelab-k27-tags.mk patch | diff1 | diff2 | blob | history
onelab-k32-tags.mk patch | diff1 | diff2 | blob | history

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