git://git.onelab.eu / plcapi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9df9197 a107b7c)
Merge commit 'local_master/master'
authorroot <root@blitz.inria.fr>
Thu, 2 Sep 2010 14:23:02 +0000 (16:23 +0200)
committerroot <root@blitz.inria.fr>
Thu, 2 Sep 2010 14:23:02 +0000 (16:23 +0200)
1  2 
PLCAPI.spec patch | diff1 | diff2 | blob | history

diff --cc PLCAPI.spec
Simple merge
plcapi