Merge branch 'master' into libretro
authornotaz <notasas@gmail.com>
Mon, 1 Apr 2013 18:05:36 +0000 (21:05 +0300)
committernotaz <notasas@gmail.com>
Mon, 1 Apr 2013 18:05:36 +0000 (21:05 +0300)
commit55bf68531a29da02569d0c53caa2f08608a191bb
tree2e0a2ca1d897cdc49ad44a29f1ea65caaf29ab72
parent98dacc2f457677c6f4460971bd838d0e13ba5ca3
parentb09a1d34f7fa3f8cee6b24ac33e3d98efad7712f
Merge branch 'master' into libretro