| commit | 93d0263404972a124e47515b32df133511b16b02 | |
| author | Ilari Liusvaara <ilari.liusvaara@elisanet.fi> | |
| Wed, 15 May 2013 14:38:00 +0000 (15 17:38 +0300) | ||
| committer | Ilari Liusvaara <ilari.liusvaara@elisanet.fi> | |
| Wed, 15 May 2013 14:38:00 +0000 (15 17:38 +0300) | ||
| tree | b729bd33e703bf7850475d7a821004a0127eb96c | treesnapshot (tar.gz zip) |
| parent | b4ad4adc0946c94606aa5935cd8238e1a40032c9 | commitdiff |
| parent | 8affdb3edc576cc0b4fcceebf4e37ab7ad191fbb | commitdiff |
Merge branch 'rr1-maint'
Conflicts:
manual.txt
src/lua/gui-core.cpp
Conflicts:
manual.txt
src/lua/gui-core.cpp
| manual.lyx | diff1 | diff2 | blobhistory |
| manual.txt | diff1 | diff2 | blobhistory |
| src/lua/gui-core.cpp | diff1 | diff2 | blobhistory |