Merge branch 'rr1-maint'
commit98b940db3c3004748f55f80e0af5606dc18b543b
authorIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Fri, 22 Mar 2013 10:17:58 +0000 (22 12:17 +0200)
committerIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Fri, 22 Mar 2013 10:17:58 +0000 (22 12:17 +0200)
tree025b26f08857a5a52863370a22f8281e9613140c
parentab9080294cda1818214529370639517788882e50
parent9c6df350bd06fd75e4ef815f2a67d29d5f9bf7f7
Merge branch 'rr1-maint'
src/core/mainloop.cpp