Merge branch 'rr1-maint'
commit7d7ff9fbf84bae64149a0292b17c4d71a642cdae
authorIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Sun, 11 Nov 2012 16:34:52 +0000 (11 18:34 +0200)
committerIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Sun, 11 Nov 2012 16:34:52 +0000 (11 18:34 +0200)
treef8857a73e8df6d877e6ed52db2906ffa8c0fa23e
parent782df8a8a0b8195286baf49659bb793fa71c7b97
parent9e08783959bb5e1a88d48c552bd6ec9caf48ef93
Merge branch 'rr1-maint'
src/core/mainloop.cpp