| commit | cbf317d6f9757e02afc591c67ea3c9b9ed2e23cd | |
| author | Lasse Karkkainen <tronic+ndrm@trn.iki.fi> | |
| Mon, 5 Nov 2012 07:52:49 +0000 (5 09:52 +0200) | ||
| committer | Lasse Karkkainen <tronic+ndrm@trn.iki.fi> | |
| Mon, 5 Nov 2012 07:52:49 +0000 (5 09:52 +0200) | ||
| tree | 76adbae92f3254dc4b4caca290277c4064c48d49 | treesnapshot (tar.gz zip) |
| parent | 18d76d436e899b097766905e6814f04a8c8637cb | commitdiff |
| parent | f0ff914724f70c23f2649d8f2ff8738c17db7c46 | commitdiff |
Merge branch 'inputcleanup'
Conflicts:
game/controllers.cc
Conflicts:
game/controllers.cc
| game/controllers.cc | diff1 | diff2 | blobhistory |