Merge branch 'master' of gitorious.org:brewtarget/brewtarget into origin/StrikeWaterT... origin/StrikeWaterToolbox
authorMaxime Lavigne (malavv) <duguigne@gmail.com>
Mon, 5 May 2014 04:12:23 +0000 (00:12 -0400)
committerMaxime Lavigne (malavv) <duguigne@gmail.com>
Mon, 5 May 2014 04:12:23 +0000 (00:12 -0400)
commitdb6deabd283ff2d9fb468f4ee90c3db6c641819e
treee23d3c9d9fd8d2250710e9ec57ed74c99836aad3
parentd3f0127ec70ac644a794c2ab51cb01513794bbdb
parentaa7206c16627ba4a4c37dcae8bf764a1614cbcca
Merge branch 'master' of gitorious.org:brewtarget/brewtarget into origin/StrikeWaterToolbox
src/CMakeLists.txt
src/MainWindow.cpp
src/MainWindow.h
ui/mainWindow.ui