git://git.onelab.eu / myplc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 706171f 6059d6c)
Merge remote branch 'origin/4.3' into 4.3
authorroot <root@blindside.verivue.com>
Thu, 14 Apr 2011 15:17:45 +0000 (11:17 -0400)
committerroot <root@blindside.verivue.com>
Thu, 14 Apr 2011 15:17:45 +0000 (11:17 -0400)
1  2 
myplc.spec patch | diff1 | diff2 | blob | history

diff --cc myplc.spec
Simple merge
myplc