Commit graph

1284 commits

Author SHA1 Message Date
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
kervala
ed7586656b Fixed: Wrong check for OS X
--HG--
branch : develop
2016-10-11 18:42:39 +02:00
kervala
aab52e2d72 Fixed: Wrong check for OS X 2016-10-11 18:42:39 +02:00
kervala
ad26721df6 Merge with develop 2016-10-11 18:04:35 +02:00
kervala
2c757adbaa Merge with develop
--HG--
branch : compatibility-develop
2016-10-11 18:04:35 +02:00
kervala
9744b44b6e Changed: Specify server to use (the one of default profile)
--HG--
branch : develop
2016-10-11 18:04:01 +02:00
kervala
bb8acc7134 Changed: Specify server to use (the one of default profile) 2016-10-11 18:04:01 +02:00
kervala
cc8a200156 Changed: Better error message
--HG--
branch : develop
2016-10-11 18:03:26 +02:00
kervala
c9a1346d76 Changed: Better error message 2016-10-11 18:03:26 +02:00
kervala
bc45604e46 Changed: Only return if downloading data
--HG--
branch : develop
2016-10-11 18:02:55 +02:00
kervala
3d965a2071 Changed: Only return if downloading data 2016-10-11 18:02:55 +02:00
kervala
d2edc7d418 Changed: Remove unused code
--HG--
branch : develop
2016-10-11 18:02:34 +02:00
kervala
db6fcdf39d Changed: Remove unused code 2016-10-11 18:02:34 +02:00
kervala
0087f4aec9 Changed: Abort if operation failed
--HG--
branch : develop
2016-10-11 18:02:20 +02:00
kervala
3d3c1d50c3 Changed: Abort if operation failed 2016-10-11 18:02:20 +02:00
kervala
27550081da Changed: Put real identifier for Ryzom Installer under OS X
--HG--
branch : develop
2016-10-11 17:46:05 +02:00
kervala
04c4a675af Changed: Put real identifier for Ryzom Installer under OS X 2016-10-11 17:46:05 +02:00
kervala
fdf69c006d Changed: Remove useless information in Info.plist
--HG--
branch : develop
2016-10-11 17:45:39 +02:00
kervala
47bc75eb42 Changed: Remove useless information in Info.plist 2016-10-11 17:45:39 +02:00
kervala
2460943bea Fixed: Check if profiles are correct before using them
--HG--
branch : develop
2016-10-11 17:43:53 +02:00
kervala
2b19bbe241 Fixed: Check if profiles are correct before using them 2016-10-11 17:43:53 +02:00
kervala
f8155c116d Changed: Little optimization
--HG--
branch : develop
2016-10-11 17:43:03 +02:00
kervala
f77f8249f1 Changed: Little optimization 2016-10-11 17:43:03 +02:00
kervala
44ddae76b8 Changed: Escape strings that will be in XML file
--HG--
branch : develop
2016-10-11 17:42:46 +02:00
kervala
06f08b1128 Changed: Escape strings that will be in XML file 2016-10-11 17:42:46 +02:00
kervala
f0d591bca7 Changed: Remove nameToId
--HG--
branch : develop
2016-10-11 17:41:49 +02:00
kervala
3f2b4f3a22 Changed: Remove nameToId 2016-10-11 17:41:49 +02:00
kervala
a1fab80cad Changed: Added more comments
--HG--
branch : develop
2016-10-11 17:28:54 +02:00
kervala
32e71c4b97 Changed: Added more comments 2016-10-11 17:28:54 +02:00
kervala
2b4058ed95 Merge with develop 2016-10-10 20:47:56 +02:00
kervala
1f95d69a81 Merge with develop
--HG--
branch : compatibility-develop
2016-10-10 20:47:56 +02:00
kervala
977241a37a Changed: Use same name for executable than bundle
--HG--
branch : develop
2016-10-10 20:47:33 +02:00
kervala
1d70d9c21a Changed: Use same name for executable than bundle 2016-10-10 20:47:33 +02:00
kervala
efdbedce3e Changed: Disable architecture choice under OS X (always 64 bits)
--HG--
branch : develop
2016-10-10 20:47:15 +02:00
kervala
1598a7a30f Changed: Disable architecture choice under OS X (always 64 bits) 2016-10-10 20:47:15 +02:00
kervala
e668405115 Merge with develop 2016-10-10 20:03:13 +02:00
kervala
40fdaa50fa Merge with develop
--HG--
branch : compatibility-develop
2016-10-10 20:03:13 +02:00
kervala
4ed4c14971 Changed: Create a bundle for Ryzom Installer under OS X
--HG--
branch : develop
2016-10-10 20:02:38 +02:00
kervala
09d682a7a3 Changed: Create a bundle for Ryzom Installer under OS X 2016-10-10 20:02:38 +02:00
kervala
35b59843cf Merge with develop 2016-10-10 18:55:28 +02:00
kervala
3ab030e359 Merge with develop
--HG--
branch : compatibility-develop
2016-10-10 18:55:28 +02:00
kervala
73fd215b21 Fixed: Use exec instead of open to launch an executable under OS X
--HG--
branch : develop
2016-10-10 18:54:03 +02:00
kervala
353458b28a Fixed: Use exec instead of open to launch an executable under OS X 2016-10-10 18:54:03 +02:00
kervala
9a402ea68c Fixed: Create directory before trying to create a client.cfg
--HG--
branch : develop
2016-10-10 18:53:39 +02:00
kervala
aaf1b2baf3 Fixed: Create directory before trying to create a client.cfg 2016-10-10 18:53:39 +02:00
kervala
2715eecda7 Merge with develop 2016-10-10 16:36:38 +02:00
kervala
41d0e70064 Merge with develop
--HG--
branch : compatibility-develop
2016-10-10 16:36:38 +02:00
kervala
f279e5f726 Fixed: Missing .sh file in QRC
--HG--
branch : develop
2016-10-10 16:35:45 +02:00
kervala
12ae0ca308 Fixed: Missing .sh file in QRC 2016-10-10 16:35:45 +02:00
kervala
5e0338d622 Fixed: Wrong modification dates of files uncompressed from 7z and ZIP archives
--HG--
branch : develop
2016-10-10 16:35:29 +02:00
kervala
2cb2a92e7a Fixed: Wrong modification dates of files uncompressed from 7z and ZIP archives 2016-10-10 16:35:29 +02:00
kervala
c315480e56 Merge with develop 2016-10-09 19:53:31 +02:00
kervala
aefaa8f098 Merge with develop
--HG--
branch : compatibility-develop
2016-10-09 19:53:31 +02:00
kervala
7b6a6945e5 Changed: Error 6 occurs when a 7z file is damaged and can't be uncompressed
--HG--
branch : develop
2016-10-09 19:50:35 +02:00
kervala
c2d74a55e0 Changed: Error 6 occurs when a 7z file is damaged and can't be uncompressed 2016-10-09 19:50:35 +02:00
kervala
8caac6363f Changed: Support special bundle structure for OS X client
--HG--
branch : develop
2016-10-09 19:50:06 +02:00
kervala
8ab5d4884b Changed: Support special bundle structure for OS X client 2016-10-09 19:50:06 +02:00
kervala
276cfa4b60 Merge with develop 2016-10-09 15:34:28 +02:00
kervala
a32878ab06 Merge with develop
--HG--
branch : compatibility-develop
2016-10-09 15:34:28 +02:00
kervala
1a3a0911e3 Changed: Write icon under Linux if not found
--HG--
branch : develop
2016-10-09 15:10:15 +02:00
kervala
bd8968ec5f Changed: Write icon under Linux if not found 2016-10-09 15:10:15 +02:00
kervala
cd618d4402 Changed: Remove whole directory if empty
--HG--
branch : develop
2016-10-09 15:09:54 +02:00
kervala
d3e0708447 Changed: Remove whole directory if empty 2016-10-09 15:09:54 +02:00
kervala
533e01ea5a Changed: Created and used isDirectoryWritable() function
--HG--
branch : develop
2016-10-09 15:09:30 +02:00
kervala
9721582940 Changed: Created and used isDirectoryWritable() function 2016-10-09 15:09:30 +02:00
kervala
16ee68d3d3 Changed: Write shortcuts under OS X
--HG--
branch : develop
2016-10-09 15:08:37 +02:00
kervala
d3a72f1506 Changed: Write shortcuts under OS X 2016-10-09 15:08:37 +02:00
kervala
360907c48d Changed: Better quality icon for Linux
--HG--
branch : develop
2016-10-09 14:51:18 +02:00
kervala
962c6f0798 Changed: Better quality icon for Linux 2016-10-09 14:51:18 +02:00
kervala
e366d8cb9b Changed: Renamed ryzom_installer.png to ryzom.png
--HG--
branch : develop
2016-10-09 14:50:51 +02:00
kervala
c747e3621a Changed: Renamed ryzom_installer.png to ryzom.png 2016-10-09 14:50:51 +02:00
kervala
a4b3c7c01c Merge with develop 2016-10-08 14:15:15 +02:00
kervala
7559190c29 Merge with develop
--HG--
branch : compatibility-develop
2016-10-08 14:15:15 +02:00
kervala
263665696a Changed: Don't propose to migrate in CInstallDialog
--HG--
branch : develop
2016-10-08 14:14:37 +02:00
kervala
76759098f2 Changed: Don't propose to migrate in CInstallDialog 2016-10-08 14:14:37 +02:00
kervala
51970f9b79 Merge with develop 2016-10-04 19:27:56 +02:00
kervala
0eeae6c652 Merge with develop
--HG--
branch : compatibility-develop
2016-10-04 19:27:56 +02:00
kervala
c348bbb3de Changed: Delete old profiles shortcuts (in case where they are renamed)
--HG--
branch : develop
2016-10-04 19:27:29 +02:00
kervala
fc920e0a39 Changed: Delete old profiles shortcuts (in case where they are renamed) 2016-10-04 19:27:29 +02:00
kervala
643c0fabf2 Merge with develop 2016-10-04 12:04:23 +02:00
kervala
e4d156be08 Merge with develop
--HG--
branch : compatibility-develop
2016-10-04 12:04:23 +02:00