Merge pull request #1493 from theuni/egl-rewrite-master

author Cory Fields <foss@atlastechnologiesinc.com>

Wed, 10 Oct 2012 21:10:23 +0000 (14:10 -0700)

committer Cory Fields <foss@atlastechnologiesinc.com>

Wed, 10 Oct 2012 21:10:23 +0000 (14:10 -0700)
author Cory Fields <foss@atlastechnologiesinc.com>
Wed, 10 Oct 2012 21:10:23 +0000 (14:10 -0700)
committer Cory Fields <foss@atlastechnologiesinc.com>
Wed, 10 Oct 2012 21:10:23 +0000 (14:10 -0700)
diff --cc xbmc/Application.cpp
Simple merge
diff --cc xbmc/Application.h
Simple merge
diff --cc xbmc/ApplicationMessenger.cpp
Simple merge
diff --cc xbmc/cores/amlplayer/AMLPlayer.cpp
Simple merge
author	Cory Fields <foss@atlastechnologiesinc.com>
	Wed, 10 Oct 2012 21:10:23 +0000 (14:10 -0700)
committer	Cory Fields <foss@atlastechnologiesinc.com>
	Wed, 10 Oct 2012 21:10:23 +0000 (14:10 -0700)
		1	2
xbmc/Application.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
xbmc/Application.h	patch \|	diff1 \|	diff2 \|	blob \| history
xbmc/ApplicationMessenger.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
xbmc/cores/amlplayer/AMLPlayer.cpp	patch \|	diff1 \|	diff2 \|	blob \| history