jfmcarreira/calyp
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Resolve merge conflict.

Browse Source
This commit is contained in:
Luis Lucas committed 2014-01-28 02:10:39 +00:00
2 parents 7dc366e5df 11e8703ed1
commit f7212d4f90
2 files changed
+3 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

source/ImageInterface.cpp
+1 -1
View File
@@ -70,7 +70,7 @@ ImageInterface::~ImageInterface()
bool ImageInterface::loadFile( const QString &fileName )
{
ConfigureResolutionDialog resolutionDialog;
ConfigureResolutionDialog resolutionDialog(this);
if( resolutionDialog.exec() == QDialog::Rejected )
{