fixed conflict and make it compile
authorMateu Batle <mateu.batle@collabora.co.uk>
Tue, 6 Apr 2010 16:57:39 +0000 (11:57 -0500)
committerMateu Batle <mateu.batle@collabora.co.uk>
Tue, 6 Apr 2010 16:57:39 +0000 (11:57 -0500)
commit2a84861dbec49481ba33c51b273720b5cae75cf0
tree9c38e5b8af1007efc27a3f7134fb00be59ba2e26
parent0c9d4b7d1d4326c3eb27aafdebc5adf268c7146a
fixed conflict and make it compile
garage.pro
mainwindow.cpp