Merge branch 'rr1-maint'
commit389a6eca43c7d4d3b32cfc0586fe6f32141b7a0b
authorIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Sat, 10 Mar 2012 19:23:24 +0000 (10 21:23 +0200)
committerIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Sat, 10 Mar 2012 19:23:24 +0000 (10 21:23 +0200)
treee82511974f720303aaddfd2d0c5db7ce0e1b16fd
parentb3d3bc5afa645c1fe422cd6c9db1206068682119
parent558d4f9318d96a5667f9f499fa36890d27f74678
Merge branch 'rr1-maint'
manual.lyx
manual.txt
src/core/mainloop.cpp