| commit | b7e3329db36bd32a221b3ec30b6b3a6f6a9dbffe | |
| author | Ilari Liusvaara <ilari.liusvaara@elisanet.fi> | |
| Sun, 14 Apr 2013 18:32:47 +0000 (14 21:32 +0300) | ||
| committer | Ilari Liusvaara <ilari.liusvaara@elisanet.fi> | |
| Sun, 14 Apr 2013 18:32:47 +0000 (14 21:32 +0300) | ||
| tree | d49a543104ca234f5ea176d61b765b9d0669f943 | treesnapshot (tar.gz zip) |
| parent | 4a482d22c142a3d3de1e7e20e4896d5fea19e2b8 | commitdiff |
| parent | 81145d38ea869a852ea23683fc1bd2e8c8a405e1 | commitdiff |
Merge branch 'rr1-maint'
Conflicts:
src/platform/wxwidgets/settings.cpp
Conflicts:
src/platform/wxwidgets/settings.cpp
| src/platform/wxwidgets/settings.cpp | diff1 | diff2 | blobhistory |