Merge remote-tracking branch 'upstream/master'
authorunknown <Martin@.(none)>
Wed, 14 Sep 2011 10:57:34 +0000 (11:57 +0100)
committerunknown <Martin@.(none)>
Wed, 14 Sep 2011 10:57:34 +0000 (11:57 +0100)
commit03c4006c6d8a36f923ca8f2fa483a9fa5e1533f5
tree379320d98eed55454a59328f72975df2dd93940e
parentb20ee49f17c252842f84ef9f695ea7260b4c95f8
parentc93ea68b5428a910914042f4429c3e8f9e7922d3
Merge remote-tracking branch 'upstream/master'
xbmc/Application.cpp
xbmc/windowing/windows/WinEventsWin32.cpp