Merge branch 'master' into libretro
authornotaz <notasas@gmail.com>
Tue, 2 Apr 2013 01:45:35 +0000 (04:45 +0300)
committernotaz <notasas@gmail.com>
Tue, 2 Apr 2013 01:45:35 +0000 (04:45 +0300)
commit1e6bc10a457d20f63a716bc5ae7298f4e12429e7
tree16e7ccf1d1281c6e291440db12057e7305b75b01
parent578a548d8ece48e4ee4e53b7a0798104d6064ae3
parent5df0e313724a202a47f088f1cb81f4ccb0910b15
Merge branch 'master' into libretro