| commit | ab9080294cda1818214529370639517788882e50 | |
| author | Ilari Liusvaara <ilari.liusvaara@elisanet.fi> | |
| Tue, 19 Mar 2013 03:32:26 +0000 (19 05:32 +0200) | ||
| committer | Ilari Liusvaara <ilari.liusvaara@elisanet.fi> | |
| Tue, 19 Mar 2013 03:32:26 +0000 (19 05:32 +0200) | ||
| tree | e3500c0631e6b0edf79ab85b4597e54f48969bac | treesnapshot (tar.gz zip) |
| parent | b534131f2180229def19cb7857f4f7eeca4fab31 | commitdiff |
| parent | c1c9c1d2b2affd11b139aaa21ef23a141a8fce0e | commitdiff |
Merge branch 'rr1-maint'
Conflicts:
manual.txt
src/lua/input.cpp
Conflicts:
manual.txt
src/lua/input.cpp
| manual.lyx | diff1 | diff2 | blobhistory |
| manual.txt | diff1 | diff2 | blobhistory |
| src/lua/input.cpp | diff1 | diff2 | blobhistory |