comparison main/main.cpp @ 605:fa99b4775d35 with-dependencies

Merge from the default branch
author Chris Cannam
date Fri, 26 Jul 2013 12:05:05 +0100
parents 4901db78f907 fba4839f8811
children b8f750319cd9
comparison
equal deleted inserted replaced
600:f3842da4d510 605:fa99b4775d35
454 454
455 delete gui; 455 delete gui;
456 456
457 cleanupMutex.unlock(); 457 cleanupMutex.unlock();
458 458
459 cleanupMutex.unlock();
460
461 return rv; 459 return rv;
462 } 460 }
463 461
464 bool SVApplication::event(QEvent *event){ 462 bool SVApplication::event(QEvent *event){
465 QString thePath; 463 QString thePath;