Merge branch 'dev' (1.3.5 release)

OpenBoard-org · Feb 25, 2017 · 00ab81e · 00ab81e
2 parents 602047a + d8b1dae
commit 00ab81e
Show file tree

Hide file tree

Showing 34 changed files with 3,701 additions and 262 deletions.
diff --git a/OpenBoard.pro b/OpenBoard.pro
@@ -10,7 +10,7 @@ CONFIG += debug_and_release \
 
 VERSION_MAJ = 1
 VERSION_MIN = 3
-VERSION_PATCH = 4
+VERSION_PATCH = 5
 VERSION_TYPE = r # a = alpha, b = beta, rc = release candidate, r = release, other => error
 VERSION_BUILD = 0
 

diff --git a/release_scripts/windows/OpenBoard.iss b/release_scripts/windows/OpenBoard.iss
@@ -119,7 +119,7 @@ Source: "{#QtDir}\plugins\mediaservice\wmfengine.dll"; DestDir: "{app}\mediaserv
 Source: "{#QtDir}\plugins\mediaservice\wmfengined.dll"; DestDir: "{app}\mediaservice"; Flags: ignoreversion   
 
 ;OpenBoardImporter
-Source: "{#ProjectRoot}\..\OpenBoard-Importer\release\OpenBoardImporter.exe"; DestDir: "{app}\Importer"; Flags: ignoreversion
+Source: "{#ProjectRoot}\..\OpenBoard-Importer\release\OpenBoardImporter.exe"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#QtLibs}\Qt5Core.dll"; DestDir: "{app}"
 Source: "{#QtLibs}\Qt5Gui.dll"; DestDir: "{app}"