Merge branch 'upstream' into libretro
authornotaz <notasas@gmail.com>
Thu, 5 Feb 2015 23:29:00 +0000 (01:29 +0200)
committernotaz <notasas@gmail.com>
Thu, 5 Feb 2015 23:29:00 +0000 (01:29 +0200)
commit2af7e74feec67c0a798ac190774cb4b3e925be76
tree27a148679e25f6edb7a2dd85c54514139bb72450
parentcebb70f24ab54693b12aaa27b85a52689e26e1ff
parent1e0eac2348343c8a046f7a75d460f087556cf7f6
Merge branch 'upstream' into libretro