Merge branch 'master' into libretro
authornotaz <notasas@gmail.com>
Mon, 1 Apr 2013 22:34:21 +0000 (01:34 +0300)
committernotaz <notasas@gmail.com>
Mon, 1 Apr 2013 22:34:21 +0000 (01:34 +0300)
commita95a5e2e0c4bd0da035729d2fd16c068cbd0f633
tree30b05666e7883393820fd4c4152fd77b6e112d0c
parent55bf68531a29da02569d0c53caa2f08608a191bb
parent0069615fdda3a28da547a191bef990256620ff69
Merge branch 'master' into libretro