| commit | 26b893e2058a03974032f86c96f3b402de80af98 | |
| author | Ilari Liusvaara <ilari.liusvaara@elisanet.fi> | |
| Sat, 27 Oct 2012 07:39:49 +0000 (27 10:39 +0300) | ||
| committer | Ilari Liusvaara <ilari.liusvaara@elisanet.fi> | |
| Sat, 27 Oct 2012 07:39:49 +0000 (27 10:39 +0300) | ||
| tree | f5084056edee4aaf353881701bdf4e329acea077 | treesnapshot (tar.gz zip) |
| parent | e02786c65dacb768184951bef97ba6371d6cd6f6 | commitdiff |
| parent | 142f197bfaadc2977bae04f97e75dce2cbca90b1 | commitdiff |
Merge branch 'rr1-maint'
Conflicts:
src/core/bsnes-legacy.cpp
src/core/controllerframe.cpp
src/platform/wxwidgets/mainwindow.cpp
Conflicts:
src/core/bsnes-legacy.cpp
src/core/controllerframe.cpp
src/platform/wxwidgets/mainwindow.cpp