merge from master
commitd787f39d93ff17e88e2ac5a999bc3000e662f7ea
authorRob Savoye <rob@welcomehome.org>
Mon, 5 Dec 2011 02:01:53 +0000 (4 19:01 -0700)
committerRob Savoye <rob@welcomehome.org>
Mon, 5 Dec 2011 02:01:53 +0000 (4 19:01 -0700)
treea577f77a4f50c1e0d82c4f133f847cb9c4239d09
parentfa46ef50ac0fc12f7f808033479a314d30a6282b
parent3c5d32e34516e7c87ca754f44b59cc28657d97ad
merge from master
configure.ac
gui/fb/fb.cpp
gui/fb/fb_glue_ovg.cpp
gui/fb/fb_glue_ovg.h
libdevice/DeviceGlue.h
libdevice/GnashDevice.h
libdevice/egl/eglDevice.h