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
lib/gdi/bcm.cpp

Simple merge
diff --cc lib/gdi/bcm.cpp
Simple merge