Merge branch 'master' of git://github.com/a11599/xbmc into a11599-master
authorJonathan Marshall <jmarshall@never.you.mind>
Fri, 25 Mar 2011 22:54:55 +0000 (11:54 +1300)
committerJonathan Marshall <jmarshall@never.you.mind>
Fri, 25 Mar 2011 22:54:55 +0000 (11:54 +1300)
commit010cf96048ef7ece96cfa47181df01d6b5d209b4
treef1ec50d8b9736e45a83de855d1723e92aad39667
parentfa429ac543d04088d48a8ab06b5b588a6fd5c7e7
parentfcc4a5a469758989c6832e9ff39ad4fd32db560a
Merge branch 'master' of git://github.com/a11599/xbmc into a11599-master

* 'master' of git://github.com/a11599/xbmc:
  Enable saving scaling method per video.