Merge branch 'upstream' into libretro
authornotaz <notasas@gmail.com>
Sun, 25 Jan 2015 21:21:40 +0000 (23:21 +0200)
committernotaz <notasas@gmail.com>
Sun, 25 Jan 2015 21:21:40 +0000 (23:21 +0200)
commit4e9adec1930817da2031fd044dc74c0f454a0079
tree854c202544c75e486d4243b34366162f03f082eb
parentbe1294d017cba3f18cf66597f0cbed207fed26bf
parentba10822d813767632c528102055e3eeb54730b2c
Merge branch 'upstream' into libretro