Merge branch 'dev' of gitorious.org:ardoise/ardoise into dev
authorLeo Flaventin Hauchecorne <hl037.prog@gmail.com>
Tue, 18 Jun 2013 00:07:50 +0000 (02:07 +0200)
committerLeo Flaventin Hauchecorne <hl037.prog@gmail.com>
Tue, 18 Jun 2013 00:07:50 +0000 (02:07 +0200)
commit14283025545aa16ba1c89f484a59945bd408dcc4
treef925d759525eb161329ab8317f7aeff1beee5b64
parent00400ceb4e56ebf84dda61be90e9447828f412c5
parentc85e5ce1ce39ede35906240224240763d5e7c32c
Merge branch 'dev' of gitorious.org:ardoise/ardoise into dev
mainwindow.cpp