kervala
|
0e63e81565
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-12-15 15:09:50 +01:00 |
|
kervala
|
3b3b1d0d4c
|
Fixed: Allow to sign OS X bundles with APPLE_CERTIFICATE
--HG--
branch : develop
|
2015-12-15 15:03:42 +01:00 |
|
Nimetu
|
f3223d268e
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-12-15 12:27:11 +02:00 |
|
Nimetu
|
55b46c5c76
|
Added: Option to set radar to follow camera
--HG--
branch : develop
|
2015-12-15 12:22:47 +02:00 |
|
Nimetu
|
6746f163bd
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-12-13 21:04:37 +02:00 |
|
Nimetu
|
0f34e0ea91
|
Changed: Attach dyn chat to main chat as default.
--HG--
branch : develop
|
2015-12-13 21:02:25 +02:00 |
|
Nimetu
|
a64709552c
|
Added: 12-hour clock in radar and chat
--HG--
branch : develop
|
2015-12-13 21:01:56 +02:00 |
|
Nimetu
|
3895644589
|
Changed: Display inventory bulk with two decimal places
--HG--
branch : develop
|
2015-12-13 21:01:13 +02:00 |
|
kervala
|
74f297f588
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-12-13 15:26:37 +01:00 |
|
kervala
|
8aff509f0f
|
Fixed: Clang warnings
--HG--
branch : develop
|
2015-12-13 15:25:28 +01:00 |
|
kervala
|
fc951a24ce
|
Fixed: Homogenize CFile::moveFile with other methods (use std::string instead of const char*)
--HG--
branch : develop
|
2015-12-13 13:03:16 +01:00 |
|
kervala
|
40d1e3407b
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-12-12 15:02:07 +01:00 |
|
kervala
|
3baeced8c6
|
Fixed: Typos again
--HG--
branch : develop
|
2015-12-12 15:01:36 +01:00 |
|
kervala
|
7c37cce41e
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-12-12 14:35:05 +01:00 |
|
kervala
|
0e62130d99
|
Fixed: Typo
--HG--
branch : develop
|
2015-12-12 14:32:08 +01:00 |
|
kervala
|
341ab98894
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-12-12 11:33:59 +01:00 |
|
kervala
|
e8f77eb967
|
Changed: Check for alternative directories
--HG--
branch : develop
|
2015-12-12 11:12:38 +01:00 |
|
kervala
|
fdbaab6a38
|
Changed: Don't need to write absolute directories in client_default.cfg, because everything must be relocatable
--HG--
branch : develop
|
2015-12-12 11:07:00 +01:00 |
|
kervala
|
6f031728f5
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-12-11 20:21:56 +01:00 |
|
kervala
|
a1a557dd1b
|
Changed: Sort dictionary keys
--HG--
branch : develop
|
2015-12-11 20:21:17 +01:00 |
|
kervala
|
a75ebeffa7
|
Changed: Append _dev to client if compiling without FINAL_VERSION (like Nevrax did)
--HG--
branch : develop
|
2015-12-11 20:16:06 +01:00 |
|
kervala
|
58506f462c
|
Changed: Use english links for spanish and russian
--HG--
branch : compatibility-develop
|
2015-12-09 22:18:48 +01:00 |
|
kervala
|
b9e6658562
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-12-07 19:38:26 +01:00 |
|
kervala
|
f833cc43de
|
Changed: Replace RYZOM_SHARE_PREFIX by getRyzomSharePrefix()
--HG--
branch : develop
|
2015-12-07 19:37:50 +01:00 |
|
kervala
|
be1ed3349c
|
Fixed: Wrong copy-paste
--HG--
branch : develop
|
2015-12-07 19:37:03 +01:00 |
|
kervala
|
00ce08e006
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-12-07 19:14:55 +01:00 |
|
kervala
|
d14cdc856e
|
Changed: Centralize config.h to avoid recompiling too many files in config.h each time config.h is modified
--HG--
branch : develop
|
2015-12-07 19:13:50 +01:00 |
|
kervala
|
71ff890d62
|
Fixed: Don't install all files in /usr/share if compiling a local client
--HG--
branch : develop
|
2015-12-07 19:11:51 +01:00 |
|
kervala
|
9df3111f21
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-12-05 18:52:33 +01:00 |
|
kervala
|
7a23ff8fd6
|
Changed: Minor changes
--HG--
branch : develop
|
2015-12-05 18:51:37 +01:00 |
|
kervala
|
9c6d5322a7
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-12-03 14:42:33 +01:00 |
|
kervala
|
14f0f3454c
|
Changed: Define supportted languages in Info.plist
--HG--
branch : develop
|
2015-12-03 14:38:16 +01:00 |
|
kervala
|
7988232bcd
|
Fixed: Define right value for Russian and Spanish in UI:TEMP:LANGUAGE
--HG--
branch : develop
|
2015-12-03 14:37:50 +01:00 |
|
kervala
|
092fad98c9
|
Changed: Define default value for AnisotropicFilter
--HG--
branch : develop
|
2015-12-03 14:35:02 +01:00 |
|
kervala
|
c2c30b4b96
|
Changed: Minor changes
--HG--
branch : develop
|
2015-12-03 14:34:45 +01:00 |
|
kervala
|
a0c6c9096c
|
Changed: Change Anisotropic Filtering for next uploaded textures
--HG--
branch : develop
|
2015-12-03 14:34:16 +01:00 |
|
kervala
|
3dafe1ff1f
|
Fixed: Anisotropic Filtering 2x didn't work
--HG--
branch : develop
|
2015-12-03 14:33:32 +01:00 |
|
kervala
|
fd4519f447
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-12-03 12:50:55 +01:00 |
|
kervala
|
86a866d4cb
|
Fixed: Completely remove Yubo Chat since it's not used anymore (patch by Kaetemi)
--HG--
branch : develop
|
2015-12-03 12:49:51 +01:00 |
|
kervala
|
6d1346d0cb
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-12-02 19:28:44 +01:00 |
|
kervala
|
1532da4618
|
Changed: Add Anisotropic Filtering in game config options
--HG--
branch : develop
|
2015-12-02 19:25:24 +01:00 |
|
kervala
|
806098e881
|
Changed: Support 64x64 icon size
--HG--
branch : develop
|
2015-12-02 19:00:55 +01:00 |
|
kervala
|
99ccb5f45d
|
Changed: Increased size of some combo boxes
--HG--
branch : develop
|
2015-12-02 18:59:26 +01:00 |
|
kervala
|
d8102a8c67
|
Changed: Minor changes
--HG--
branch : develop
|
2015-12-02 18:55:31 +01:00 |
|
kervala
|
09198ccde4
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-12-02 09:22:19 +01:00 |
|
kervala
|
532f8c502f
|
Fixed: Search icons under Linux in default directories
--HG--
branch : develop
|
2015-12-02 09:21:44 +01:00 |
|
kervala
|
62a8964c79
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-12-01 15:59:53 +01:00 |
|
kervala
|
1afec95dd9
|
Fixed: Only display VR page in game config if compiled with a VR SDK
--HG--
branch : develop
|
2015-12-01 15:58:45 +01:00 |
|
kervala
|
ec731539b9
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-11-30 14:20:16 +01:00 |
|
kervala
|
ebae4c2691
|
Fixed: Compilation under Linux
--HG--
branch : develop
|
2015-11-30 14:16:47 +01:00 |
|
kervala
|
5688c75bba
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-11-29 17:55:33 +01:00 |
|
kervala
|
68a9e3156e
|
Changed: Look into predefined pathes for Ryzom icons
--HG--
branch : develop
|
2015-11-29 14:43:08 +01:00 |
|
kervala
|
1a40880d6f
|
Changed: Use RYZOM_VERSION from config.h (generated by CMake)
--HG--
branch : develop
|
2015-11-29 14:37:14 +01:00 |
|
kervala
|
7a2dd18095
|
Changed: Add and use more constants in config.h
--HG--
branch : develop
|
2015-11-29 14:19:02 +01:00 |
|
kervala
|
ce519d6d34
|
Changed: Minor changes
--HG--
branch : develop
|
2015-11-29 14:12:55 +01:00 |
|
kervala
|
520eb941b1
|
Changed: Simplified CMake ELSE and ENDIF
--HG--
branch : develop
|
2015-11-29 14:06:05 +01:00 |
|
kervala
|
02594e50de
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-11-27 19:38:15 +01:00 |
|
kervala
|
4d4df6aaf8
|
Changed: Updated UNIX icons
--HG--
branch : develop
|
2015-11-27 19:37:14 +01:00 |
|
kervala
|
5e9d8ff513
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-11-24 19:02:37 +01:00 |
|
kervala
|
56988bf85b
|
Changed: Minor change
--HG--
branch : develop
|
2015-11-24 19:01:54 +01:00 |
|
kervala
|
86c2148df8
|
Changed: Remove Yubo chat references
--HG--
branch : develop
|
2015-11-24 19:01:41 +01:00 |
|
kervala
|
04900c43ee
|
Added: Missing data from gamedev.bnp
--HG--
branch : compatibility-develop
|
2015-11-24 18:57:48 +01:00 |
|
kervala
|
9dffada687
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-11-23 16:44:42 +01:00 |
|
kervala
|
b6e265bcdd
|
Changed: New icon generated with iconutil (requires more icons sizes so bigger file)
--HG--
branch : develop
|
2015-11-23 16:44:06 +01:00 |
|
kervala
|
f5a771fd7b
|
Added: SSL certificate for secure.ryzom.com
--HG--
branch : compatibility-develop
|
2015-11-23 15:45:32 +01:00 |
|
kervala
|
2c71549aff
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-11-22 18:42:36 +01:00 |
|
kervala
|
9b0ca9e81e
|
Changed: Added details for executable (we'll need to improve it for Ryzom Core)
--HG--
branch : develop
|
2015-11-22 18:41:30 +01:00 |
|
kervala
|
c9a96d4fee
|
Changed: New icon based on another Atys image with colors more vivid
--HG--
branch : develop
|
2015-11-22 18:40:21 +01:00 |
|
kervala
|
5492b8db07
|
Changed: URLs don't exist anymore
--HG--
branch : develop
|
2015-11-22 18:37:52 +01:00 |
|
kervala
|
884730ea78
|
Fixed: Crash under Linux (patch by Nimetu), fixes #252
--HG--
branch : develop
|
2015-11-22 18:36:53 +01:00 |
|
kervala
|
7e0e11ef3d
|
Fixed: InstallStatsUrl points to a wrong URL but needs to be defined
--HG--
branch : compatibility-develop
|
2015-11-21 19:40:19 +01:00 |
|
kervala
|
c1799e95d8
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-11-21 18:09:38 +01:00 |
|
kervala
|
5a5dd33a9c
|
Changed: Removed useless parameter for nlerror
--HG--
branch : develop
|
2015-11-21 17:17:19 +01:00 |
|
kervala
|
4f574b034b
|
Changed: Revert back LandscapeTileNear and LandscapeThreshold default values
--HG--
branch : compatibility-develop
|
2015-11-19 13:43:18 +01:00 |
|
kervala
|
0fa40775f4
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-11-15 13:33:37 +01:00 |
|
kervala
|
817486538c
|
Changed: Minor changes
--HG--
branch : develop
|
2015-11-15 13:29:34 +01:00 |
|
kervala
|
334f2b43c6
|
Fixed: Display title and artist name from ogg files in music player
--HG--
branch : develop
|
2015-11-15 13:13:44 +01:00 |
|
kervala
|
f9c789e4db
|
Fixed: Only open supported music formats in music player
--HG--
branch : develop
|
2015-11-15 13:12:54 +01:00 |
|
kervala
|
a2ba342e06
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-11-14 19:29:43 +01:00 |
|
kervala
|
d5c1d18ebf
|
Changed: Write revision and build date in crash logs
--HG--
branch : develop
|
2015-11-14 19:28:36 +01:00 |
|
kervala
|
e96730829c
|
Fixed: Compilation
--HG--
branch : develop
|
2015-11-14 19:28:01 +01:00 |
|
kervala
|
fb1d5134ba
|
Changed: Minor changes
--HG--
branch : develop
|
2015-11-14 18:33:13 +01:00 |
|
kervala
|
9e88fa645b
|
Changed: Support for integer types in Lua 5.3, fixes #253
--HG--
branch : develop
|
2015-11-14 18:19:58 +01:00 |
|
kervala
|
64e4468943
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-11-14 12:13:12 +01:00 |
|
kervala
|
53f46eb5fa
|
Changed: Support for integer types in Lua 5.3, fixes #253
--HG--
branch : develop
|
2015-11-14 11:46:17 +01:00 |
|
kervala
|
7f62faa794
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-11-13 19:52:35 +01:00 |
|
kervala
|
630a22d428
|
Changed: Minor changes
--HG--
branch : develop
|
2015-11-13 19:37:32 +01:00 |
|
kervala
|
c854201d91
|
Changed: Removed useless LoadLuaDebugger
--HG--
branch : develop
|
2015-11-13 19:36:46 +01:00 |
|
kervala
|
aa3d209d39
|
Fixed: Crash in CLuaManager
--HG--
branch : develop
|
2015-11-13 19:18:41 +01:00 |
|
kervala
|
a8d81c689b
|
Changed: Support for integer types in Lua 5.3, fixes #253
--HG--
branch : develop
|
2015-11-13 18:42:50 +01:00 |
|
kervala
|
4a97f339a3
|
Changed: Replaced some NLMISC::strlwr by NLMISC::toLower
--HG--
branch : develop
|
2015-11-13 16:22:49 +01:00 |
|
Nimetu
|
c5a3d993be
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-11-12 23:48:57 +02:00 |
|
Nimetu
|
4bb0da6a72
|
Correctly save and restore screen resolution from icfg file
--HG--
branch : develop
|
2015-11-12 23:47:23 +02:00 |
|
kervala
|
28bbf76c8f
|
Fixed: Bug with language in URLs
--HG--
branch : compatibility-develop
|
2015-11-11 16:40:42 +01:00 |
|
kervala
|
a1c89b0d7b
|
Fixed: Wrong comparison
--HG--
branch : compatibility-develop
|
2015-11-09 12:48:07 +01:00 |
|
kervala
|
cdab63fb2c
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-11-09 12:47:24 +01:00 |
|
kervala
|
7258054350
|
Fixed: Don't put same twice frequencies in list
--HG--
branch : develop
|
2015-11-09 12:46:55 +01:00 |
|
kervala
|
e8b0ae3f81
|
Changed: Don't log nldebug in Release
--HG--
branch : develop
|
2015-11-09 12:46:02 +01:00 |
|
kervala
|
3f55f85e10
|
Changed: Frequency to 0 to enable automatic detection
--HG--
branch : compatibility-develop
|
2015-11-09 10:05:39 +01:00 |
|
kervala
|
2548561d1e
|
Changed: Removed unused/invalid URLs and updated some of them
--HG--
branch : compatibility-develop
|
2015-11-09 10:04:43 +01:00 |
|
kervala
|
cc7c889775
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-11-09 10:01:24 +01:00 |
|
kervala
|
a340260e40
|
Fixed: Force use of NVIDIA GPU if Optimus is present
--HG--
branch : develop
|
2015-11-09 09:55:38 +01:00 |
|
kervala
|
53783c0e71
|
Changed: Support new forums URLs
--HG--
branch : compatibility-develop
|
2015-11-08 14:47:56 +01:00 |
|
kervala
|
9cfebf3eb3
|
Changed: Remove hardcoded FAQ URLs
--HG--
branch : compatibility-develop
|
2015-11-08 14:21:26 +01:00 |
|
kervala
|
1e892148c7
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-11-08 14:14:53 +01:00 |
|
kervala
|
326520465c
|
Fixed: If frequency is 0, use the first one in list
--HG--
branch : develop
|
2015-11-08 13:43:31 +01:00 |
|
kervala
|
744966acd6
|
Changed: More comments
--HG--
branch : develop
|
2015-11-08 13:43:02 +01:00 |
|
kervala
|
2be81c5445
|
Changed: Replace int 3 asm by __debugbreak()
--HG--
branch : develop
|
2015-11-08 13:25:36 +01:00 |
|
kervala
|
2b155c2d50
|
Changed: Minor changes
--HG--
branch : develop
|
2015-11-08 13:22:33 +01:00 |
|
kervala
|
3ac728872e
|
Fixed: Typos (renamed restaure to restore)
--HG--
branch : develop
|
2015-11-08 11:53:46 +01:00 |
|
kervala
|
25febfa3bc
|
Merge
--HG--
branch : develop
|
2015-11-08 10:48:42 +01:00 |
|
Nimetu
|
dc01c6afec
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-11-08 03:07:14 +02:00 |
|
Nimetu
|
8a55f1b1e9
|
Changed: Allow to set max concurrent cURL connections per CGroupHTML instance
--HG--
branch : develop
|
2015-11-08 01:51:34 +02:00 |
|
kervala
|
831a3eb7b7
|
Changed: Minor changes
--HG--
branch : develop
|
2015-11-07 22:57:41 +01:00 |
|
kervala
|
c2c930035c
|
Changed: Use new Ryzom icon under Windows
--HG--
branch : develop
|
2015-11-07 22:56:45 +01:00 |
|
kervala
|
6fa9131bf8
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-11-07 18:34:25 +01:00 |
|
kervala
|
cafc06e70c
|
Fixed: Clang warnings
--HG--
branch : develop
|
2015-11-07 18:33:43 +01:00 |
|
kervala
|
67a857e0fe
|
Fixed: Use ShellExecute to open a document or URL as primary method, because second one doesn't work everytime
--HG--
branch : develop
|
2015-11-07 18:31:58 +01:00 |
|
kervala
|
cf4de232fc
|
Changed: Updated default settings for official client
--HG--
branch : compatibility-develop
|
2015-11-07 15:57:38 +01:00 |
|
kervala
|
5a34740b15
|
Added: Steam OS X script installscript_osx.vdf
--HG--
branch : compatibility-develop
|
2015-11-07 15:56:47 +01:00 |
|
kervala
|
54ce40729d
|
Fixed: Add revision in Info.plist for long version
--HG--
branch : compatibility-develop
|
2015-11-07 14:57:43 +01:00 |
|
kervala
|
d30be0841e
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-11-07 14:55:30 +01:00 |
|
kervala
|
b944892c8f
|
Fixed: Clang warning, ContinentMngr.cur() is checked later
--HG--
branch : develop
|
2015-11-07 14:54:24 +01:00 |
|
kervala
|
ffb600e03e
|
Changed: Minor changes
--HG--
branch : develop
|
2015-11-07 14:53:49 +01:00 |
|
kervala
|
9b231afa54
|
Fixed: Get system language code under OS X too and added method in NLMISC::CI18N
--HG--
branch : develop
|
2015-11-07 14:52:46 +01:00 |
|
kervala
|
f095121991
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-11-06 15:49:55 +01:00 |
|
kervala
|
9e74adee86
|
Changed: Minor changes
--HG--
branch : develop
|
2015-11-06 15:48:23 +01:00 |
|
kervala
|
2baddc78ac
|
More checks before to get a pointer on a CCDBNodeLeaf, fixes #251
--HG--
branch : develop
|
2015-11-06 15:47:58 +01:00 |
|
kervala
|
93a03b5db0
|
Fixed: clang warnings
--HG--
branch : develop
|
2015-11-06 15:24:19 +01:00 |
|
kervala
|
8b0d8282bc
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-11-05 17:30:12 +01:00 |
|
kervala
|
94b7148d44
|
Fixed: Wrong index for video modes comparison (nFoundMode was an index in strings not CMode list, now renamed to nFoundStringMode)
--HG--
branch : develop
|
2015-11-05 17:26:45 +01:00 |
|
kervala
|
2a9b9deaf9
|
Fixed: Didn't initialize video modes frequencies
--HG--
branch : develop
|
2015-11-05 17:22:43 +01:00 |
|
kervala
|
804c5cb80b
|
Fixed: Update also Depth and Frequency with default resolution
--HG--
branch : develop
|
2015-11-05 17:18:14 +01:00 |
|
kervala
|
56e1f5eff0
|
Changed: Centralize version different formats
--HG--
branch : develop
|
2015-11-05 17:16:55 +01:00 |
|
kervala
|
b44b24acd3
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-11-05 09:30:56 +01:00 |
|
Nimetu
|
7d9f4030ff
|
Fixed: Wrong key shortcuts in debug help screen (issue #241)
--HG--
branch : develop
|
2015-11-04 19:42:42 +02:00 |
|
kervala
|
93f27a1a48
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-11-01 20:13:33 +01:00 |
|
kervala
|
e1b810ab85
|
Fixed: Crash when displaying configuration window
--HG--
branch : develop
|
2015-11-01 16:46:47 +01:00 |
|
kervala
|
0e96e3505d
|
Fixed: Use official support URL
--HG--
branch : compatibility-develop
|
2015-10-31 16:14:34 +01:00 |
|
kervala
|
aa3a9dcead
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-10-01 14:54:18 +02:00 |
|
kervala
|
67c6edc9ae
|
Changed: Use invalid screen mode by default (will be overridden by config files)
--HG--
branch : develop
|
2015-09-22 09:55:06 +02:00 |
|
kervala
|
00c36d3ac4
|
Changed: If Width and Height are invalid, use current screen mode
--HG--
branch : develop
|
2015-09-22 09:46:51 +02:00 |
|
kervala
|
a21ebfe544
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-04-25 19:49:15 +02:00 |
|
kervala
|
39670e5b77
|
Comment translation
--HG--
branch : develop
|
2015-04-25 19:17:58 +02:00 |
|
kervala
|
7cecd18eee
|
Save space in debug screen to display VPB and VPC
--HG--
branch : develop
|
2015-04-25 19:16:06 +02:00 |
|
kervala
|
9a55ee46b7
|
Removed dependency on libwww
--HG--
branch : develop
|
2015-04-25 12:53:52 +02:00 |
|
kervala
|
385e066ac0
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-04-22 17:58:09 +02:00 |
|
Nimetu
|
c58e10f173
|
Add "select_shortcut_bar_2" action handler (issue 222)
--HG--
branch : develop
|
2015-04-21 18:54:08 +03:00 |
|
kervala
|
4600c74b6b
|
Merge with develop
--HG--
branch : compatibility-develop
|
2015-04-20 13:38:51 +02:00 |
|
Nimetu
|
26571de439
|
Fix compiling under windows
--HG--
branch : develop
|
2015-04-20 01:04:52 +03:00 |
|