diff options
| author | degasus <wickmarkus@web.de> | 2013-03-06 19:07:15 +0100 |
|---|---|---|
| committer | degasus <wickmarkus@web.de> | 2013-03-06 19:07:15 +0100 |
| commit | 5dd502df3b678e04ecc5a5a79af43ecf047b9f92 (patch) | |
| tree | 24c85efd5aeb3295587a30d04fff27bd4927fad2 /Source/Core/InputCommon/Src/ControllerInterface/Android | |
| parent | 03511d54d6235eff1e24ec4958e3ea6ed095a687 (diff) | |
| parent | 7158c14d7a1e6c86bfb6602a11d79dbe989cac9d (diff) | |
Merge branch 'master' into GLSL-master
the only commit on master is to fix vertexloader, so disable jit for osx
Diffstat (limited to 'Source/Core/InputCommon/Src/ControllerInterface/Android')
0 files changed, 0 insertions, 0 deletions