merge from master
commit5db08f33783b5636ddf0bd6a8e84b878d1f9824b
authorRob Savoye <rob@welcomehome.org>
Mon, 30 May 2011 13:28:21 +0000 (30 07:28 -0600)
committerRob Savoye <rob@welcomehome.org>
Mon, 30 May 2011 13:28:21 +0000 (30 07:28 -0600)
tree23f955bb9847befe0b4c7d08d459b8010ad1475b
parent39846e8404578c8fd66d30b43cc570f43dd82d44
parent767c823e7c5d975962bca7183441332e6f7b54a1
merge from master
Makefile.am
configure.ac
gui/Makefile.am
gui/Player.cpp
gui/fb/fb.cpp
libcore/Makefile.am
libdevice/vaapi/vaapi.am