Conflict solved: mainwindow.cpp and calculate.cpp
authorToni Jussila <toni.jussila@gmail.com>
Fri, 28 May 2010 12:09:17 +0000 (15:09 +0300)
committerToni Jussila <toni.jussila@gmail.com>
Fri, 28 May 2010 12:09:17 +0000 (15:09 +0300)

No differences found