git://git.onelab.eu / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f52ee68 9c8cf1a)
Merge branch 'master' of ssh://git.onelab.eu/git/build
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 7 Jun 2011 14:32:40 +0000 (16:32 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 7 Jun 2011 14:32:40 +0000 (16:32 +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