Commit graph

3007 commits

Author SHA1 Message Date
kervala
16df8b8c1d Changed: Use empty() instead of comparison with ""
--HG--
branch : develop
2016-10-30 15:59:20 +01:00
kervala
b785a5114b Changed: Use empty() instead of comparison with "" 2016-10-30 15:59:20 +01:00
kervala
e3c2cb2a30 Changed: Use clear() instead of affectation
--HG--
branch : develop
2016-10-30 15:56:41 +01:00
kervala
b07db1a990 Changed: Use clear() instead of affectation 2016-10-30 15:56:41 +01:00
kervala
2fe0e84096 Changed: Simplified layout for display
--HG--
branch : develop
2016-10-30 15:35:58 +01:00
kervala
574405e5b5 Changed: Simplified layout for display 2016-10-30 15:35:58 +01:00
kervala
86415a3c2b Fixed: Add config variable if not present
--HG--
branch : develop
2016-10-30 15:35:44 +01:00
kervala
cc0ff91df5 Fixed: Add config variable if not present 2016-10-30 15:35:44 +01:00
kervala
8f6aa83a7b Fixed: Choice of sound driver
--HG--
branch : develop
2016-10-30 15:35:11 +01:00
kervala
7023fc88ac Fixed: Choice of sound driver 2016-10-30 15:35:11 +01:00
kervala
1c872d9ef9 Fixed: Translations files are all using UTF-8 by default now (and LF instead of CRLF), fixes #128
--HG--
branch : develop
2016-10-29 19:50:28 +02:00
kervala
0fa7db915e Fixed: Translations files are all using UTF-8 by default now (and LF instead of CRLF), fixes #128 2016-10-29 19:50:28 +02:00
kervala
0cfd8cb35d Merge with develop 2016-10-27 16:48:45 +02:00
kervala
1e1f6ece8b Merge with develop
--HG--
branch : compatibility-develop
2016-10-27 16:48:45 +02:00
kervala
1362e2d470 Fixed: Restore last selected profile
--HG--
branch : develop
2016-10-27 16:47:44 +02:00
kervala
4e68b3c40a Fixed: Restore last selected profile 2016-10-27 16:47:44 +02:00
kervala
19e8ee1d05 Changed: Simplified all ENDIF and ELSE
--HG--
branch : develop
2016-10-27 10:54:09 +02:00
kervala
a53ec84c73 Changed: Simplified all ENDIF and ELSE 2016-10-27 10:54:09 +02:00
kervala
956da7f9da Merge with develop 2016-10-25 17:41:54 +02:00
kervala
5322109eb3 Merge with develop
--HG--
branch : compatibility-develop
2016-10-25 17:41:54 +02:00
kervala
a7531eac0d Fixed: Ryzom client patcher doesn't depend on any cfg file anymore
--HG--
branch : develop
2016-10-25 16:02:46 +02:00
kervala
ad0ba5c6b1 Fixed: Ryzom client patcher doesn't depend on any cfg file anymore 2016-10-25 16:02:46 +02:00
kervala
627dea4a06 Merge with develop 2016-10-23 16:29:49 +02:00
kervala
68163157ba Merge with develop
--HG--
branch : compatibility-develop
2016-10-23 16:29:49 +02:00
kervala
0b99222330 Fixed: Clear m_srcDirectory if directory doesn't exist anymore
--HG--
branch : develop
2016-10-23 16:28:17 +02:00
kervala
3c52626be2 Fixed: Clear m_srcDirectory if directory doesn't exist anymore 2016-10-23 16:28:17 +02:00
kervala
e9ba12b931 Changed: Display filename in unsuported format warning
--HG--
branch : develop
2016-10-23 16:27:49 +02:00
kervala
bfccba236f Changed: Display filename in unsuported format warning 2016-10-23 16:27:49 +02:00
kervala
14917f114f Merge with develop 2016-10-22 16:55:51 +02:00
kervala
564f00014a Merge with develop
--HG--
branch : compatibility-develop
2016-10-22 16:55:51 +02:00
kervala
c106557bbc Changed: Force process name for Ryzom Installer
--HG--
branch : develop
2016-10-22 16:48:34 +02:00
kervala
d66e9867c0 Changed: Force process name for Ryzom Installer 2016-10-22 16:48:34 +02:00
kervala
bf6f28ce43 Merge with develop 2016-10-21 16:54:50 +02:00
kervala
acfdb8d6fa Merge with develop
--HG--
branch : compatibility-develop
2016-10-21 16:54:50 +02:00
kervala
7c9a242b66 Changed: Compile CMigrateDialog anyway even if unused
--HG--
branch : develop
2016-10-21 16:54:08 +02:00
kervala
3a0d88c07d Changed: Compile CMigrateDialog anyway even if unused 2016-10-21 16:54:08 +02:00
kervala
d078103453 Merge with develop 2016-10-21 16:50:04 +02:00
kervala
d5d4ba1e0c Merge with develop
--HG--
branch : compatibility-develop
2016-10-21 16:50:04 +02:00
kervala
177dacf100 Fixed: Compilation of Ryzom Installer
--HG--
branch : develop
2016-10-21 16:09:02 +02:00
kervala
3c3869fef5 Fixed: Compilation of Ryzom Installer 2016-10-21 16:09:02 +02:00
kervala
76c27c64f8 Merge with develop 2016-10-21 14:27:31 +02:00
kervala
7363803b2c Merge with develop
--HG--
branch : compatibility-develop
2016-10-21 14:27:31 +02:00
kervala
552e147c76 Changed: If old installer doesn't return a version, overwrite it
--HG--
branch : develop
2016-10-21 14:27:05 +02:00
kervala
1615c21909 Changed: If old installer doesn't return a version, overwrite it 2016-10-21 14:27:05 +02:00
kervala
7ad0b610ba Changed: Open in ReadOnly the process
--HG--
branch : develop
2016-10-21 14:26:46 +02:00
kervala
60e927a3a0 Changed: Open in ReadOnly the process 2016-10-21 14:26:46 +02:00
kervala
41fa1a938e Changed: More warnings
--HG--
branch : develop
2016-10-21 14:26:31 +02:00
kervala
aa42c17fed Changed: More warnings 2016-10-21 14:26:31 +02:00
kervala
0a502f64b2 Changed: More messages in log
--HG--
branch : develop
2016-10-21 12:58:23 +02:00
kervala
a45d723334 Changed: More messages in log 2016-10-21 12:58:23 +02:00
kervala
fccaee006b Changed: Only check if Ryzom is installed in current directory under Windows
--HG--
branch : develop
2016-10-21 12:57:35 +02:00
kervala
d1073593b0 Changed: Only check if Ryzom is installed in current directory under Windows 2016-10-21 12:57:35 +02:00
kervala
6b9a267abc Changed: Only enable migration under Windows when launched from 2.1 client directory
--HG--
branch : develop
2016-10-21 12:53:10 +02:00
kervala
88a87a07a0 Changed: Only enable migration under Windows when launched from 2.1 client directory 2016-10-21 12:53:10 +02:00
kervala
7e6c5c13bd Merge with develop 2016-10-20 17:46:58 +02:00
kervala
064c3778f2 Merge with develop
--HG--
branch : compatibility-develop
2016-10-20 17:46:58 +02:00
kervala
d574641c79 Changed: HTTP code 307 is not an error
--HG--
branch : develop
2016-10-20 15:30:43 +02:00
kervala
f079236f7f Changed: HTTP code 307 is not an error 2016-10-20 15:30:43 +02:00
kervala
e50c1fcf98 Changed: Write warnings in log
--HG--
branch : develop
2016-10-20 15:30:30 +02:00
kervala
6c077b671d Changed: Write warnings in log 2016-10-20 15:30:30 +02:00
kervala
efaadd4301 Changed: Real version of Ryzom Installer as user-agent
--HG--
branch : develop
2016-10-20 15:30:12 +02:00
kervala
9dc33effe6 Changed: Real version of Ryzom Installer as user-agent 2016-10-20 15:30:12 +02:00
kervala
f95d95bdc5 Merge with develop 2016-10-20 14:48:16 +02:00
kervala
1879212116 Merge with develop
--HG--
branch : compatibility-develop
2016-10-20 14:48:16 +02:00
kervala
22ff9504a7 Changed: Log version of installed Installer
--HG--
branch : develop
2016-10-20 14:47:45 +02:00
kervala
f2a3a4e99f Changed: Log version of installed Installer 2016-10-20 14:47:45 +02:00
kervala
3526efb920 Fixed: 307 is a normal redirect
--HG--
branch : develop
2016-10-20 14:47:28 +02:00
kervala
59b4206afb Fixed: 307 is a normal redirect 2016-10-20 14:47:28 +02:00
kervala
b6fe697a5d Changed: Init log just after loading config file
--HG--
branch : develop
2016-10-20 14:47:08 +02:00
kervala
7940b17ba7 Changed: Init log just after loading config file 2016-10-20 14:47:08 +02:00
kervala
0111c69054 Merge with develop 2016-10-20 13:14:19 +02:00
kervala
d2cd7ebb1a Merge with develop
--HG--
branch : compatibility-develop
2016-10-20 13:14:19 +02:00
kervala
881375c35f Added: Missing file
--HG--
branch : develop
2016-10-20 13:13:53 +02:00
kervala
68d9be0bd9 Added: Missing file 2016-10-20 13:13:53 +02:00
kervala
c3bcfb42b8 Merge with develop 2016-10-20 13:08:48 +02:00
kervala
2e7af6ab0d Merge with develop
--HG--
branch : compatibility-develop
2016-10-20 13:08:48 +02:00
kervala
9321323ba4 Changed: Use sender() instead of member
--HG--
branch : develop
2016-10-20 13:07:56 +02:00
kervala
3f25776129 Changed: Use sender() instead of member 2016-10-20 13:07:56 +02:00
kervala
de2eba12fe Changed: Logs in Ryzom Installer
--HG--
branch : develop
2016-10-20 13:07:18 +02:00
kervala
a46bb29254 Changed: Logs in Ryzom Installer 2016-10-20 13:07:18 +02:00
kervala
afc03e63ee Merge with develop 2016-10-19 17:25:45 +02:00
kervala
1e98eeaa0b Merge with develop
--HG--
branch : compatibility-develop
2016-10-19 17:25:45 +02:00
kervala
2858fce968 Fixed: Trying to resume after a 206 HTTP status code
--HG--
branch : develop
2016-10-19 17:23:42 +02:00
kervala
a99cb3c992 Fixed: Trying to resume after a 206 HTTP status code 2016-10-19 17:23:42 +02:00
kervala
37fe37c8ed Fixed: When incrementing version of ini file, check servers by ID not by index
--HG--
branch : develop
2016-10-19 17:06:25 +02:00
kervala
e3291f999c Fixed: When incrementing version of ini file, check servers by ID not by index 2016-10-19 17:06:25 +02:00
kervala
a388c89fd5 Merge with develop 2016-10-19 10:50:26 +02:00
kervala
9bd254d25a Merge with develop
--HG--
branch : compatibility-develop
2016-10-19 10:50:26 +02:00
kervala
b62562c896 Changed: Save default profile when clicking on Play or Configure
--HG--
branch : develop
2016-10-19 10:49:51 +02:00
kervala
3534ca411b Changed: Save default profile when clicking on Play or Configure 2016-10-19 10:49:51 +02:00
kervala
c05a8d3c2e Fixed: Try to put executable permissions before to launch an executable under UNIX
--HG--
branch : develop
2016-10-19 10:46:56 +02:00
kervala
9666ed648b Fixed: Try to put executable permissions before to launch an executable under UNIX 2016-10-19 10:46:56 +02:00
kervala
33e1dedbf1 Merge with develop 2016-10-19 09:52:38 +02:00
kervala
5517ff15f5 Merge with develop
--HG--
branch : compatibility-develop
2016-10-19 09:52:38 +02:00
kervala
3c5a7de588 Fixed: Also rename executable under Linux
--HG--
branch : develop
2016-10-19 09:52:12 +02:00
kervala
cd2a7f0efc Fixed: Also rename executable under Linux 2016-10-19 09:52:12 +02:00
kervala
f2907587c4 Merge with develop 2016-10-18 20:35:14 +02:00
kervala
ea1522c904 Merge with develop
--HG--
branch : compatibility-develop
2016-10-18 20:35:14 +02:00
kervala
31f4957a40 Fixed: Display a more explicit error if NLMISC::CSystemInfo::availableHDSpace returns 0
--HG--
branch : develop
2016-10-18 20:34:25 +02:00
kervala
8837ac7831 Fixed: Display a more explicit error if NLMISC::CSystemInfo::availableHDSpace returns 0 2016-10-18 20:34:25 +02:00
kervala
54c7e89e05 Merge with develop 2016-10-18 17:47:19 +02:00
kervala
9b70baf02b Merge with develop
--HG--
branch : compatibility-develop
2016-10-18 17:47:19 +02:00
kervala
f93e5458d9 Changed: Skip already uncompressed files
--HG--
branch : develop
2016-10-18 17:46:31 +02:00
kervala
98cd2c5e02 Changed: Skip already uncompressed files 2016-10-18 17:46:31 +02:00
kervala
0c63da38f1 Merge with develop 2016-10-18 13:43:08 +02:00
kervala
7b3fe00c6a Merge with develop
--HG--
branch : compatibility-develop
2016-10-18 13:43:08 +02:00
kervala
d7f62326aa Fixed: Restart Installer at the end of installation/migration
--HG--
branch : develop
2016-10-18 13:42:19 +02:00
kervala
2f98e52dbf Fixed: Restart Installer at the end of installation/migration 2016-10-18 13:42:19 +02:00
kervala
1162edcb46 Fixed: Case where additional files are not in source directory
--HG--
branch : develop
2016-10-18 13:37:43 +02:00
kervala
ae71ce0f89 Fixed: Case where additional files are not in source directory 2016-10-18 13:37:43 +02:00
kervala
80cbda23e5 Merge with develop 2016-10-18 10:27:44 +02:00
kervala
0238b30489 Merge with develop
--HG--
branch : compatibility-develop
2016-10-18 10:27:44 +02:00
kervala
6801bf34d4 Fixed: Special case under Windows when Installer is run from TEMP directory
--HG--
branch : develop
2016-10-18 10:26:41 +02:00
kervala
3b7f35efcc Fixed: Special case under Windows when Installer is run from TEMP directory 2016-10-18 10:26:41 +02:00
kervala
bf8d9aef12 Changed: Check written bytes at each step and at the end
--HG--
branch : develop
2016-10-18 10:25:31 +02:00
kervala
f225b26b76 Changed: Check written bytes at each step and at the end 2016-10-18 10:25:31 +02:00
kervala
508a6723a2 Changed: Use getInstallerCurrentDirPath() instead of QApplication::applicationDirPath()
--HG--
branch : develop
2016-10-18 10:24:10 +02:00
kervala
f413f6e488 Changed: Use getInstallerCurrentDirPath() instead of QApplication::applicationDirPath() 2016-10-18 10:24:10 +02:00
kervala
29aa0c1722 Changed: Restart installed Installer intead of current one
--HG--
branch : develop
2016-10-18 10:23:49 +02:00
kervala
746336f249 Changed: Restart installed Installer intead of current one 2016-10-18 10:23:49 +02:00
kervala
a31e0b8d25 Merge with develop 2016-10-17 20:45:43 +02:00
kervala
35cdaab027 Merge with develop
--HG--
branch : compatibility-develop
2016-10-17 20:45:43 +02:00
kervala
a57a0eb0ce Fixed: Support QFile write in smaller parts
--HG--
branch : develop
2016-10-17 20:45:14 +02:00
kervala
9ed1ce8f7c Fixed: Support QFile write in smaller parts 2016-10-17 20:45:14 +02:00
kervala
4d36b39ebc Merge with develop 2016-10-17 15:43:33 +02:00
kervala
5ed1b3a35b Merge with develop
--HG--
branch : compatibility-develop
2016-10-17 15:43:33 +02:00
kervala
e43551908e Fixed: Missing variable
--HG--
branch : develop
2016-10-17 15:43:05 +02:00
kervala
30160d3f15 Fixed: Missing variable 2016-10-17 15:43:05 +02:00
kervala
b5a9e81b83 Merge with develop 2016-10-17 13:53:10 +02:00
kervala
a7b799fef0 Merge with develop
--HG--
branch : compatibility-develop
2016-10-17 13:53:10 +02:00
kervala
0e0ae0fde4 Fixed: Typo...
--HG--
branch : develop
2016-10-17 13:52:20 +02:00
kervala
9807be9534 Fixed: Typo... 2016-10-17 13:52:20 +02:00
kervala
98a2f3740c Merge with develop 2016-10-17 13:14:20 +02:00
kervala
6c7059b6fe Merge with develop
--HG--
branch : compatibility-develop
2016-10-17 13:14:20 +02:00
kervala
292dd3b6fb Fixed: Ryzom was the executable name in same directory
--HG--
branch : develop
2016-10-17 13:13:55 +02:00
kervala
1c941a69f2 Fixed: Ryzom was the executable name in same directory 2016-10-17 13:13:55 +02:00
kervala
25d66dafa2 Merge with develop 2016-10-17 13:09:17 +02:00
kervala
1891033bc1 Merge with develop
--HG--
branch : compatibility-develop
2016-10-17 13:09:17 +02:00
kervala
273d5ab80d Fixed: getInstallerCurrentFilePath instead of getInstallerCurrentDirPath
--HG--
branch : develop
2016-10-17 13:08:14 +02:00
kervala
c0678ac664 Fixed: getInstallerCurrentFilePath instead of getInstallerCurrentDirPath 2016-10-17 13:08:14 +02:00
kervala
8f2fc49d7d Changed: Don't need arguments
--HG--
branch : develop
2016-10-17 13:07:32 +02:00
kervala
887eee427d Changed: Don't need arguments 2016-10-17 13:07:32 +02:00
kervala
8a52b34e09 Merge with develop 2016-10-17 11:49:38 +02:00
kervala
14ee62676f Merge with develop
--HG--
branch : compatibility-develop
2016-10-17 11:49:38 +02:00
kervala
364efba09d Merge with develop 2016-10-17 11:35:24 +02:00
kervala
c418eb0c03 Merge with develop
--HG--
branch : compatibility-develop
2016-10-17 11:35:24 +02:00
kervala
4aac2d263b Fixed: Bundle name under OS X
--HG--
branch : develop
2016-10-17 11:24:31 +02:00
kervala
51aeaf44fa Fixed: Bundle name under OS X 2016-10-17 11:24:31 +02:00
kervala
3476eeb5e9 Changed: Don't copy twice the same file under other platforms than Windows
--HG--
branch : develop
2016-10-17 11:23:49 +02:00
kervala
31efed9b17 Changed: Don't copy twice the same file under other platforms than Windows 2016-10-17 11:23:49 +02:00
kervala
45c326a733 Changed: Keep other servers when upgrading ryzom_installer.ini
--HG--
branch : develop
2016-10-17 11:20:20 +02:00
kervala
b860ae4428 Changed: Keep other servers when upgrading ryzom_installer.ini 2016-10-17 11:20:20 +02:00
kervala
ab1fb50ab5 Changed: Relaunch installed Ryzom Installer if exists
--HG--
branch : develop
2016-10-17 11:19:50 +02:00
kervala
377b122772 Changed: Relaunch installed Ryzom Installer if exists 2016-10-17 11:19:50 +02:00
kervala
d1e078aea5 Fixed: getInstallerCurrentDirPath() returns bundle parent directory under OS X
--HG--
branch : develop
2016-10-17 11:19:11 +02:00
kervala
a307601382 Fixed: getInstallerCurrentDirPath() returns bundle parent directory under OS X 2016-10-17 11:19:11 +02:00
kervala
f40e6deb7a Changed: Display also destination in error
--HG--
branch : develop
2016-10-17 11:17:35 +02:00
kervala
681d3b5c73 Changed: Display also destination in error 2016-10-17 11:17:35 +02:00
kervala
48f013a86e Changed: Use getInstallerCurrentFilePath() instead of QApplication::applicationFilePath()
--HG--
branch : develop
2016-10-17 11:16:34 +02:00
kervala
ae56643f3a Changed: Use getInstallerCurrentFilePath() instead of QApplication::applicationFilePath() 2016-10-17 11:16:34 +02:00
kervala
0101cdfacf Fixed: Recursive copy
--HG--
branch : develop
2016-10-17 11:13:49 +02:00
kervala
18b7697a23 Fixed: Recursive copy 2016-10-17 11:13:49 +02:00
kervala
cb878500ad Fixed: Ryzom Installer executable under OS X
--HG--
branch : develop
2016-10-17 11:12:06 +02:00
kervala
23b9105803 Fixed: Ryzom Installer executable under OS X 2016-10-17 11:12:06 +02:00
kervala
2379918a3e Merge with develop 2016-10-16 17:39:37 +02:00
kervala
702516171d Merge with develop
--HG--
branch : compatibility-develop
2016-10-16 17:39:37 +02:00
kervala
bf39b96792 Fixed: Compilation
--HG--
branch : develop
2016-10-16 17:38:00 +02:00
kervala
997b4b9e00 Fixed: Compilation 2016-10-16 17:38:00 +02:00
kervala
f358ae1c9a Merge with develop 2016-10-16 17:31:37 +02:00
kervala
142a06f40d Merge with develop
--HG--
branch : compatibility-develop
2016-10-16 17:31:37 +02:00
kervala
b78444490c Fixed: Infinite loop when HTTP error occurs
--HG--
branch : develop
2016-10-16 17:29:10 +02:00
kervala
9ab3b7f253 Fixed: Infinite loop when HTTP error occurs 2016-10-16 17:29:10 +02:00
kervala
a5a488da3e Changed: Always launch the more recent version of Installer
--HG--
branch : develop
2016-10-16 17:28:17 +02:00
kervala
fe890b3728 Changed: Always launch the more recent version of Installer 2016-10-16 17:28:17 +02:00
kervala
f65883296b Changed: Use getInstallerInstalledFilePath() to get installed Installer full path
--HG--
branch : develop
2016-10-16 17:26:05 +02:00
kervala
a2f67bf469 Changed: Use getInstallerInstalledFilePath() to get installed Installer full path 2016-10-16 17:26:05 +02:00
kervala
34734e4fbe Fixed: Display all executables under OS X and Linux
--HG--
branch : develop
2016-10-16 17:22:51 +02:00
kervala
7a61907a41 Fixed: Display all executables under OS X and Linux 2016-10-16 17:22:51 +02:00
kervala
35b79a347b Changed: Updated translations
--HG--
branch : develop
2016-10-16 17:20:02 +02:00
kervala
be26e83637 Changed: Updated translations 2016-10-16 17:20:02 +02:00
kervala
cfe14a5bcd Changed: Better profiles editor under OS X
--HG--
branch : develop
2016-10-16 17:19:51 +02:00
kervala
bff7557fb9 Changed: Better profiles editor under OS X 2016-10-16 17:19:51 +02:00
kervala
6fc8853d51 Merge with develop 2016-10-15 17:16:34 +02:00
kervala
c3c377e4a6 Merge with develop
--HG--
branch : compatibility-develop
2016-10-15 17:16:34 +02:00
kervala
999fd9d3aa Changed: Install shorcuts in Applications instead of /Applications
--HG--
branch : develop
2016-10-15 17:13:51 +02:00
kervala
dd0f1ab72b Changed: Install shorcuts in Applications instead of /Applications 2016-10-15 17:13:51 +02:00
kervala
43736cf523 Fixed: Wrong filename (because unallocated)
--HG--
branch : develop
2016-10-15 17:12:51 +02:00
kervala
f11cc79b02 Fixed: Wrong filename (because unallocated) 2016-10-15 17:12:51 +02:00
kervala
f14a220e8e Changed: Use flat frames (better under Windows XP)
--HG--
branch : develop
2016-10-15 17:12:20 +02:00
kervala
23ba7e265b Changed: Use flat frames (better under Windows XP) 2016-10-15 17:12:20 +02:00
kervala
4b6e360e22 Merge with develop 2016-10-13 19:51:38 +02:00
kervala
8324628ad4 Merge with develop
--HG--
branch : compatibility-develop
2016-10-13 19:51:38 +02:00
kervala
016e075fa5 Changed: Only install same client arch as Installer under Linux
--HG--
branch : develop
2016-10-13 19:50:11 +02:00
kervala
dfba29c457 Changed: Only install same client arch as Installer under Linux 2016-10-13 19:50:11 +02:00
kervala
8f33264131 Merge with develop 2016-10-11 20:28:25 +02:00
kervala
2c84f4b178 Merge with develop
--HG--
branch : compatibility-develop
2016-10-11 20:28:25 +02:00
kervala
01fd44cdc2 Changed: Don't need to install PNG, it'll be created
--HG--
branch : develop
2016-10-11 20:27:55 +02:00
kervala
e7acc8f8ef Changed: Don't need to install PNG, it'll be created 2016-10-11 20:27:55 +02:00
kervala
975a8f2d53 Merge with develop 2016-10-11 18:43:07 +02:00
kervala
55d357e555 Merge with develop
--HG--
branch : compatibility-develop
2016-10-11 18:43:07 +02:00