Merge remote branch 'upstream/master'
authorLars Op den Kamp <lars@opdenkamp.eu>
Wed, 12 Jan 2011 23:44:03 +0000 (00:44 +0100)
committerLars Op den Kamp <lars@opdenkamp.eu>
Wed, 12 Jan 2011 23:44:03 +0000 (00:44 +0100)
commit8789a095083373808fec20e61be530875901493c
tree612199ad3329ee5488f037bf6afb746a8c448b4b
parent1369b7de230cc8cb150b5ff2992b805d4c9ec370
parent44fa75994fe48e3a94bb72afcf9035ede5fbe681
Merge remote branch 'upstream/master'
xbmc/Application.cpp
xbmc/Application.h