git.cweiske.de / enigma2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 06a1a62 63e3216)
Merge branch 'obi/bcm_accel'
authorAndreas Oberritter <obi@opendreambox.org>
Wed, 16 Mar 2011 12:59:25 +0000 (13:59 +0100)
committerAndreas Oberritter <obi@opendreambox.org>
Wed, 16 Mar 2011 12:59:25 +0000 (13:59 +0100)
1  2 
lib/gdi/accel.cpp patch | diff1 | diff2 | blob | history
lib/gdi/bcm.cpp patch | diff1 | diff2 | blob | history

diff --cc lib/gdi/accel.cpp
Simple merge
diff --cc lib/gdi/bcm.cpp
Simple merge
Clone of git://git.opendreambox.org/git/enigma2.git before dream multimedia removed all the engima2 sources