git://git.onelab.eu / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 70a0795 b13979e)
Merge branch 'master' of ssh://git.onelab.eu/git/build
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Tue, 16 Jun 2015 07:01:25 +0000 (09:01 +0200)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Tue, 16 Jun 2015 07:01:25 +0000 (09:01 +0200)
1  2 
lxc-tags.mk patch | diff1 | diff2 | blob | history
onelab-tags.mk patch | diff1 | diff2 | blob | history

diff --cc lxc-tags.mk
Simple merge
diff --cc onelab-tags.mk
Simple merge
build