Merge branch 'master' into libretro
authornotaz <notasas@gmail.com>
Wed, 3 Apr 2013 00:12:29 +0000 (03:12 +0300)
committernotaz <notasas@gmail.com>
Wed, 3 Apr 2013 00:12:29 +0000 (03:12 +0300)
commit98175912f3cf2989569feca57f71aa98889f2786
treee34a4fc5ddb1bc22a0d091385dfb56c726fafe30
parent1e6bc10a457d20f63a716bc5ae7298f4e12429e7
parent10858959854a4e0864cad8629756216c4b2d4310
Merge branch 'master' into libretro