Merge branch 'DiscStub' of git://github.com/HarryMuscle/xbmc into HarryMuscle-DiscStub
authorJonathan Marshall <jmarshall@never.you.mind>
Wed, 13 Apr 2011 21:07:33 +0000 (09:07 +1200)
committerJonathan Marshall <jmarshall@never.you.mind>
Wed, 13 Apr 2011 21:07:33 +0000 (09:07 +1200)
* 'DiscStub' of git://github.com/HarryMuscle/xbmc:
  Improve handling of stub files for systems with no DVD drive
  Add second line to the PlayEject dialog
  Add second line to the PlayEject dialog

1  2 
xbmc/Application.cpp

Simple merge