Merge branch 'master' into libretro
authornotaz <notasas@gmail.com>
Mon, 1 Apr 2013 23:10:18 +0000 (02:10 +0300)
committernotaz <notasas@gmail.com>
Mon, 1 Apr 2013 23:10:18 +0000 (02:10 +0300)
commitc4b7d708b35f00c17f27133695342f2feb00f5f0
tree47b182b4339ca858539e209c36b9a446ae8420fd
parenta95a5e2e0c4bd0da035729d2fd16c068cbd0f633
parent4b5b6cf713480df38c7e79d669cb9e72d70b3ba0
Merge branch 'master' into libretro