| commit | e60af4d32cfb0b56e6e2c0c42d765bfa3de8745b | |
| author | Ilari Liusvaara <ilari.liusvaara@elisanet.fi> | |
| Wed, 3 Apr 2013 07:39:18 +0000 (3 10:39 +0300) | ||
| committer | Ilari Liusvaara <ilari.liusvaara@elisanet.fi> | |
| Wed, 3 Apr 2013 07:39:18 +0000 (3 10:39 +0300) | ||
| tree | ebe7043bc5cccf30d257aef56982143040c194b2 | treesnapshot (tar.gz zip) |
| parent | 65218e0894624b6bc814fc54ddff0d185f72c0b8 | commitdiff |
| parent | cf19dc333557d55b4b276a694f92e4f8651e40d9 | commitdiff |
Merge branch 'rr1-maint'
Conflicts:
src/platform/wxwidgets/status.cpp
Conflicts:
src/platform/wxwidgets/status.cpp
| src/platform/wxwidgets/editor-movie.cpp | diff1 | diff2 | blobhistory |
| src/platform/wxwidgets/status.cpp | diff1 | diff2 | blobhistory |