git://git.onelab.eu / playground.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8a634cb ab6612b)
Merge branch 'master' into sideways
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Sat, 28 Mar 2015 15:38:11 +0000 (16:38 +0100)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Sat, 28 Mar 2015 15:38:11 +0000 (16:38 +0100)
1  2 
cleanup.txt patch | diff1 | diff2 | blob | history

diff --cc cleanup.txt
Simple merge
playground