Merge branch 'master' into libretro
authornotaz <notasas@gmail.com>
Tue, 2 Apr 2013 01:04:52 +0000 (04:04 +0300)
committernotaz <notasas@gmail.com>
Tue, 2 Apr 2013 01:04:52 +0000 (04:04 +0300)
commit578a548d8ece48e4ee4e53b7a0798104d6064ae3
tree0ff9dadf10cc65326bd30fe1952a2bf6af585c03
parentc4b7d708b35f00c17f27133695342f2feb00f5f0
parent4d6467383217647e3fbc58ab9213a31c0f3bd8c9
Merge branch 'master' into libretro