comparison main/MainWindow.cpp @ 481:e0e554997d3c integration_library

Merge from the default branch with a broken configure file
author mathieub <mathieu.barthet@eecs.qmul.ac.uk>
date Mon, 10 Oct 2011 22:45:50 +0100
parents a373a9cdbe13
children e5c6aed2bf6b
comparison
equal deleted inserted replaced
480:afc6b5453fb9 481:e0e554997d3c