Merge branch 'revert-7917af51' into 'Dev'

Revert "Merge branch 'MuckeMachtSachen' into 'Dev'"

See merge request creyd/intelliphoto!11
This commit is contained in:
Jonas Mucke
2019-12-05 16:17:34 +00:00
2 changed files with 2 additions and 2 deletions

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject> <!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 4.10.2, 2019-12-05T16:55:34. --> <!-- Written by QtCreator 4.10.2, 2019-12-05T14:51:28. -->
<qtcreator> <qtcreator>
<data> <data>
<variable>EnvironmentId</variable> <variable>EnvironmentId</variable>

View File

@@ -7,7 +7,7 @@ int main(int argc, char *argv[])
// The main application // The main application
QApplication app(argc, argv); QApplication app(argc, argv);
//some nice ass looking comment
// Create and open the main window // Create and open the main window
IntelliPhotoGui window; IntelliPhotoGui window;
window.show(); window.show();