| commit | 64683d69089a6824c8efcca545005ac5c5a36649 | |
| author | Ilari Liusvaara <ilari.liusvaara@elisanet.fi> | |
| Fri, 14 Jun 2013 11:09:43 +0000 (14 14:09 +0300) | ||
| committer | Ilari Liusvaara <ilari.liusvaara@elisanet.fi> | |
| Fri, 14 Jun 2013 11:09:43 +0000 (14 14:09 +0300) | ||
| tree | cc4815fe9054adf877d750f5a7179a7f88d2fc37 | treesnapshot (tar.gz zip) |
| parent | 1866f480b2de63564db461a36e073ea151acbd00 | commitdiff |
| parent | 081adfb56580b4b5655cf65e1553eae24588c869 | commitdiff |
Merge branch 'rr1-maint'
Conflicts:
src/core/command.cpp
src/lua/ibind.cpp
src/platform/wxwidgets/settings.cpp
Conflicts:
src/core/command.cpp
src/lua/ibind.cpp
src/platform/wxwidgets/settings.cpp