git://git.onelab.eu / plcapi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7632d26 2a525d3)
Merge commit 'origin/master'
authorroot <root@blitz.inria.fr>
Tue, 16 Nov 2010 20:01:55 +0000 (21:01 +0100)
committerroot <root@blitz.inria.fr>
Tue, 16 Nov 2010 20:01:55 +0000 (21:01 +0100)
1  2 
PLCAPI.spec patch | diff1 | diff2 | blob | history

diff --cc PLCAPI.spec
Simple merge
plcapi