Merge branch 'version-bump' of github.com:thedax/ppsspp into thedax-version-bumpv0.9.9
commitb421e29391b34d997b2c99ce2bdc74a0df5bb472
authorHenrik Rydgard <hrydgard@gmail.com>
Tue, 22 Jul 2014 14:14:59 +0000 (22 16:14 +0200)
committerHenrik Rydgard <hrydgard@gmail.com>
Tue, 22 Jul 2014 14:14:59 +0000 (22 16:14 +0200)
tree1832ef388df88f0555e7f15bee48072604fd0bb3
parent272f0b8c7071e831be3131cac74fad81568a6ae0
parentb767de934aecd6e84d37b3ae78764b6a52c2f0a1
Merge branch 'version-bump' of github.com:thedax/ppsspp into thedax-version-bump
Blackberry/bar-descriptor.xml
Qt/Settings.pri