Ryzom
/
ryzom-core
1
1
Fork 0
Code Issues 38 Pull Requests Projects 1 Releases 1 Activity
5,090 Commits
110 Branches
68 Tags
272 MiB
fix-linux-multi-monitor
core4
add-toggle-free-look-ah
main/yubo-dev
fix-media-player-playlist-limit
feature/change-sound-driver-ingame
10-use-item-shortcut-client
53-setting-to-change-tooltip-opacity
47-hide-quality-indicator-on-item-if-equal-to-1
18-enchant-icon-does-not-properly-update-on-weapon
feature/quick-start-py
23-sort-inventory-by-type-weight-bulk-quantity-quality-2
51-shift-enter-at-merchant-no-longer-sells-to-merchant
52-add-escape-shortcut-to-open-quit-menu
60-weapon-does-not-show-in-both-hands-on-load-in
main/atys-live
main/gingo-test
feature/split-action-bar-1-and-2
55-remove-chat-replies-shortcuts
46-rework-item-buff-icon-placement
43-crafting-items-are-not-sorted
40-dragging-from-player-trade-to-inventory-takes-two-tries
38-add-smooth-resizing-of-entitie-when-vpb-are-changed
36-add-ability-to-have-translated-titles-with-untraslated-fields
35-allow-drag-and-drop-between-zig-and-guild
feature/compatibility-old-gcc
26-encoding-issues-in-client-beta-after-core4-merge
fix-viewtext-localized-text
main/atys-pre-live
21-fix-nopatch-without-argument-crash
30-changes-for-silan-refactoring
fixes
27-fixed-crash-with-html-image-downloads
feature/hunter
16-drag-drop-to-player-trade-window-from-all-inventories
23-sort-inventory-by-type-weight-bulk-quantity-quality
25-remove-lock-option-from-item-menu-in-guild-inventory
feature/colissions-stairs
feature/core4-atys
feature/hunter-dxsdk-download
merge/2021-11-19
fix-area-effect-flying-text
add-screenshot-dir-to-config
feature/develop-atys
self-kill
inventory-fixes
develop
13-inventory-fixes
20-add-equip-option-to-right-click-dialog-in-all-inventories
6-animal-status-innacurate-when-zig-is-in-bag
atys
use-item-macro
ryzomclassic-develop
ryzom/silan_refactoring
feature/prepare-cross-merge
storyline/s2e0
feature/bonusmalus-timers
ryzom/ark/features
ryzom/op_refactoring
feature/css-lang-var
ryzom/ui/improvements
fx
feature/hires-textures
feature/cdb-packed-ryzomclassic
feature/cdb-packed
feature/opengl3
ryzom/patch-changes
fix_opengl_on_mac
ryzom/deepl
ryzom/lua-features
fix-media-player
feature/code-to-root
feature/post-code-move
feature/pre-code-move
fix-menu-scroll
storyline/s2e1
webig-fixes
ryzom/sheets
feature/streamed-package
hg/develop
hg/hotfix/patches-from-atys
hg/yubo
hg/atys
hg/ark
hg/feature/html-improvements
undelete-develop
hg/feature/menu-navi
hg/compatibility-develop
kaetemi-develop
feature/nel-dll
feature/version-resources
feature/clean-deprecated
feature/3ds-max-2020
feature/pipeline-tools
feature/build-pipeline-v3
hg/feature/material-editor
hg/feature/opengl3
hg/feature/qt5
hg/feature/cef3
hg/feature/streamed-package
hg/feature/light_cycle
hg/compatibility
hg/feature/gsoc2012-fabien
hg/feature/build_pipeline_v3
hg/feature/cdb-packed
hg/feature/game-device
hg/feature/sdl2
hg/feature/sse2
hg/feature/gsoc2013-dfighter
hg/feature/sound
3.3.0
Live-746
Live-791
Live-803
Live-813
Live-831
Live-832
Live-834
compatibility-merge
latest-default-graft
latest-graft-to-default
latest-merge-from-default
live/837
live/893
live/895
ryzom-patch-3.0.0
ryzom-patch-3.0.1
ryzom-patch-3.0.2
ryzom-patch-3.1.0
ryzom-patch-3.1.0-april_patch
ryzom-patch-3.1.0-hotfix
ryzom-patch-3.2.0
ryzom-patch-3.2.1
ryzom-patch-3.3.0
ryzom-patch-3.3.1
ryzom-patch-3.4.0
ryzom-patch-3.4.0_Atysmas
ryzom-patch-3.4.0_Steam_Fix
ryzom-patch-3.5.0
ryzom-patch-3.5.0.9637
ryzom/3.0.0
ryzom/3.0.1
ryzom/3.0.2
ryzom/3.1.0
ryzom/3.1.0-april_patch
ryzom/3.1.0-hotfix
ryzom/3.2.0
ryzom/3.2.1
ryzom/3.3.0
ryzom/3.3.1
ryzom/3.4.0
ryzom/3.4.0-atysmas
ryzom/3.4.0-steam_fix
ryzom/3.5.0
ryzom/3.5.0.9637
ryzomcore/v0.10.0
ryzomcore/v0.11.0
ryzomcore/v0.11.1
ryzomcore/v0.11.2
ryzomcore/v0.11.3
ryzomcore/v0.12.0
ryzomcore/v0.8.0
ryzomcore/v0.9.0
ryzomcore/v0.9.1
ryzomcore/v1.0.0
ryzomcore/v1.0.1
ryzomcore_0_8_0
v0.10.0
v0.11.0
v0.11.1
v0.11.2
v0.11.3
v0.12.0
v0.8.0
v0.9.0
v0.9.1
v1.0.0
v1.0.1
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '78515477e9'
${ noResults }
Commit Graph

4890 Commits (78515477e93dfc0b0ff50730e66e9e80e906d2db)

Author SHA1 Message Date
dfighter1985 3d9357637b Backed out from fdc0d40 
--HG--
branch : feature-crashreport
 10 years ago
dfighter1985 7efbee6d0a Backed out from 5942903 
--HG--
branch : feature-crashreport
 10 years ago
dfighter1985 4e00903dcc Back out from 5bb3dad 
--HG--
branch : feature-crashreport
 10 years ago
Jan Boon 543331ea75 Merged in nimetu/ryzomcore/issue-221 (pull request #100) 
improve chatlog file (issue #221)

--HG--
branch : develop
 10 years ago
kaetemi 18d211f79b Merge with hotfix 
--HG--
branch : develop
 10 years ago
kaetemi 6e06b4e79e Merge with dfighter-tools 
--HG--
branch : hotfix
 10 years ago
kaetemi b120d68a98 Merge with hotfix 
--HG--
branch : develop
 10 years ago
dfighter1985 36ce53b1ba Merged in hotfix (pull request #117) 
Merge hotfix branch

--HG--
branch : develop
 10 years ago
dfighter1985 d2194cda05 Removed unused references to CMsgBoxDisplayer. 
--HG--
branch : feature-crashreport
 10 years ago
dfighter1985 2f808280c8 Removed unused references to CMsgBoxDisplayer. 
--HG--
branch : hotfix
 10 years ago
dfighter1985 e130625cca A little cleanup of CMsgBoxDisplayer. 
--HG--
branch : feature-crashreport
 10 years ago
dfighter1985 ac6bda5084 A little cleanup of CMsgBoxDisplayer. 
--HG--
branch : hotfix
 10 years ago
dfighter1985 1476bfe648 Use CMsgBoxDisplayer on platforms other than Windows as well. 
--HG--
branch : feature-crashreport
 10 years ago
dfighter1985 070dad8e53 Use CMsgBoxDisplayer on platforms other than Windows as well. 
--HG--
branch : hotfix
 10 years ago
dfighter1985 7efb3334fc Install rcerror 
--HG--
branch : feature-crashreport
 10 years ago
dfighter1985 4fd17a428d Install rcerror 
--HG--
branch : hotfix
 10 years ago
kaetemi a8db3b2dda Visual Studio 2013 compilation support for Ryzom Client 
--HG--
branch : develop
 10 years ago
kaetemi 2667c5d8a2 Visual Studio 2013 compilation support for Ryzom Client 
--HG--
branch : develop
 10 years ago
kaetemi aebda454dc Visual Studio 2013 compilation support for Ryzom Client 
--HG--
branch : develop
 10 years ago
kaetemi 997722ee6b Visual Studio 2013 compilation support for NeL Tools 
--HG--
branch : develop
 10 years ago
kaetemi 32b3b4ac80 Visual Studio 2013 compilation support for Ryzom Client 
--HG--
branch : develop
 10 years ago
kaetemi 1879a434f7 Visual Studio 2013 compilation support for NLGUI 
--HG--
branch : develop
 10 years ago
kaetemi 221267364d Visual Studio 2013 compilation support for NL3D 
--HG--
branch : develop
 10 years ago
kaetemi a15221b00d Visual Studio 2013 compilation support for NLSOUND 
--HG--
branch : develop
 10 years ago
kaetemi f5335f068d Visual Studio 2013 compilation support for NLMISC 
--HG--
branch : develop
 10 years ago
kaetemi cb986cba6f Visual Studio 2013 compilation support for NLPACS 
--HG--
branch : develop
 10 years ago
kaetemi 7ea4cff032 Visual Studio 2013 compilation support for NLNET 
--HG--
branch : develop
 10 years ago
kaetemi 6db8abf95c Visual Studio 2013 compilation support for NLMISC 
--HG--
branch : develop
 10 years ago
dfighter1985 9b29695635 Typo... 
--HG--
branch : feature-crashreport
 10 years ago
dfighter1985 141dddb58c Typo... 
--HG--
branch : hotfix
 10 years ago
dfighter1985 ef56d28542 Oups 
--HG--
branch : feature-crashreport
 10 years ago
dfighter1985 c7681bcb2b Oups 
--HG--
branch : hotfix
 10 years ago
dfighter1985 72566f1a71 Tell the user if the report couldn't be sent. 
--HG--
branch : feature-crashreport
 10 years ago
dfighter1985 bb9f6261d7 Tell the user if the report couldn't be sent. 
--HG--
branch : hotfix
 10 years ago
dfighter1985 14a709449a Override the cursor while sending the report. 
--HG--
branch : feature-crashreport
 10 years ago
dfighter1985 3c61e39ce3 Override the cursor while sending the report. 
--HG--
branch : hotfix
 10 years ago
dfighter1985 f0869aa659 Unfortunately on Windows argc and argv parameters are unreliable inside a Qt application, so I had to hardcode the report file name. :( 
--HG--
branch : feature-crashreport
 10 years ago
dfighter1985 469e5583c1 Unfortunately on Windows argc and argv parameters are unreliable inside a Qt application, so I had to hardcode the report file name. :( 
--HG--
branch : hotfix
 10 years ago
dfighter1985 9518a80c99 Probably a good idea to look for rcerror as rcerror.exe on Windows. 
--HG--
branch : feature-crashreport
 10 years ago
dfighter1985 2fe77d719f Probably a good idea to look for rcerror as rcerror.exe on Windows. 
--HG--
branch : hotfix
 10 years ago
dfighter1985 03ce683e49 Implemented the bug report Qt app and an example web app that takes the report. 
--HG--
branch : feature-crashreport
 10 years ago
dfighter1985 a6ee23ebe4 Implemented the bug report Qt app and an example web app that takes the report. 
--HG--
branch : hotfix
 10 years ago
dfighter1985 ee0b630f95 Added the Ryzom Core Error Reporter's skeleton. 
--HG--
branch : feature-crashreport
 10 years ago
dfighter1985 8208a473c4 Added the Ryzom Core Error Reporter's skeleton. 
--HG--
branch : hotfix
 10 years ago
dfighter1985 7302023777 CMsgBoxDisplayer should not present a dialog now, but write the report to a file then attempt to launch the error reporter application. Which ofc doesn't exist yet in this commit. 
--HG--
branch : feature-crashreport
 10 years ago
dfighter1985 fea7cff850 CMsgBoxDisplayer should not present a dialog now, but write the report to a file then attempt to launch the error reporter application. Which ofc doesn't exist yet in this commit. 
--HG--
branch : hotfix
 10 years ago
kervala 0c054b5201 Merge with hotfix 
--HG--
branch : develop
 10 years ago
kervala 9d6b9daebe Fixed: Wrong include guard for admin_modules PCH 
--HG--
branch : hotfix
 10 years ago
kervala 6784301afc Merge with hotfix 
--HG--
branch : develop
 10 years ago
kervala bd054ea776 Fixed: Warning multichars 
--HG--
branch : hotfix
 10 years ago
kervala 1690f777a1 Fixed: Unnamed semaphores are deprecated under OS X 
--HG--
branch : hotfix
 10 years ago
kervala 5aa8a1d615 Fixed: Warning assert always false 
--HG--
branch : hotfix
 10 years ago
kervala 3509d75ad6 Fixed: Warning comparing an enum to an int 
--HG--
branch : hotfix
 10 years ago
kervala 3aa1661c90 Merge with hotfix 
--HG--
branch : develop
 10 years ago
kervala 859387758d Fixed: Compilation 
--HG--
branch : hotfix
 10 years ago
kervala a723f9261b Merge with hotfix 
--HG--
branch : develop
 10 years ago
kervala a42569ad24 Added: PCH for admin_modules 
--HG--
branch : hotfix
 10 years ago
kervala e9b5cc4410 Merge with hotfix 
--HG--
branch : develop
 10 years ago
kervala 4b397f3e5b Changed: Improved User Agent management 
--HG--
branch : hotfix
 10 years ago
kervala e8b0765e7c Merge with hotfix 
--HG--
branch : develop
 10 years ago
kervala cdd35f58a1 Fixed: Warning with multichars to int conversion 
--HG--
branch : hotfix
 10 years ago
kervala 8472a6ff7f Fixed: Compilation 
--HG--
branch : hotfix
 10 years ago
kervala e0c95a74af Changed: Updated CMale modules 
--HG--
branch : hotfix
 10 years ago
kervala 943131b802 Changed: Replaced atoi and atof by NLMISC::fromString 
--HG--
branch : hotfix
 10 years ago
kervala 1742997984 Changed: Minor changes 
--HG--
branch : hotfix
 10 years ago
kervala d774dcac3e Changed: Use Ryzom user agent for CURL 
--HG--
branch : hotfix
 10 years ago
kervala 49bbb10b58 Fixed: Missing namespace 
--HG--
branch : hotfix
 10 years ago
kervala 1960f5c448 Changed: std::string already initialized to en empty string 
--HG--
branch : hotfix
 10 years ago
kervala 76e64fcb42 Changed: Used INVALID_AI_INSTANCE in CUsedContinent::getInstanceForContinent 
--HG--
branch : hotfix
 10 years ago
kervala ee7008ae02 Changed: Possible bug if string not found 
--HG--
branch : hotfix
 10 years ago
kervala 6e1abd80d3 Fixed: Unable to patch when Ryzom was located on a mounted FS 
--HG--
branch : hotfix
 10 years ago
kervala 165524d1df Changed: Used PCH for admin_modules 
--HG--
branch : hotfix
 10 years ago
kervala 4de072865b Changed: Check getSpawn() before calling its methods 
--HG--
branch : hotfix
 10 years ago
kervala b0937ec02b Changed: Minor changes 
--HG--
branch : hotfix
 10 years ago
kervala 6853497593 Changed: Replaced atof by NLMISC::fromString 
--HG--
branch : hotfix
 10 years ago
kervala 3039428094 Fixed: Compilation warnings 
--HG--
branch : hotfix
 10 years ago
kervala eb5fecf8ce Fixed: Only keep Release and Debug configurations in CMake 
--HG--
branch : hotfix
 10 years ago
dfighter1985 225d786e7f Merged in hotfix (pull request #114) 
Merging hotfix branch

--HG--
branch : develop
 10 years ago
dfighter1985 b381ef6fae Add the data directory to the search path. 
--HG--
branch : hotfix
 10 years ago
dfighter1985 26f1cc6fac Added ryzom.ttf, it will be installed to the data directory. 
--HG--
branch : hotfix
 10 years ago
dfighter1985 79cd6bfaee Include rgba.h in libwww.h. Thanks Nimetu! 
--HG--
branch : hotfix
 10 years ago
dfighter1985 28b0a0a040 Change the cursor to a wait cursor when applying settings in the settings dialog. 
--HG--
branch : hotfix
 10 years ago
dfighter1985 44c6f93b26 We can now set whether to use OpenGL in WE in the WE settings page. For whatever reason VMware despises the OpenGL viewport so it's a good idea to turn it off inside VMware. 
--HG--
branch : hotfix
 10 years ago
dfighter1985 b530d99bf1 Renamed the studio startup settings dialog to avoid name conflict with the core plugin's settings dialog. 
--HG--
branch : hotfix
 10 years ago
dfighter1985 b881f9558b Read the GUI Editor widget and expression definition XML files from the right directory. 
--HG--
branch : hotfix
 10 years ago
dfighter1985 a2c96c3053 Install the GUI Editor widget and expression definition files to the data dir. 
--HG--
branch : hotfix
 10 years ago
dfighter1985 46cc31d0d0 Handle relative paths when loading .worldedit files in World Editor. 
--HG--
branch : hotfix
 10 years ago
dfighter1985 7f35c5959a Merged in hotfix (pull request #111) 
Merge hotfix

--HG--
branch : develop
 10 years ago
dfighter1985 5e55a7b7bb Erm. Initialize Nel3D on other platforms too... 
--HG--
branch : hotfix
 10 years ago
dfighter1985 c85b83fcdb Merged in hotfix (pull request #108) 
Merge hotfix branch.

--HG--
branch : develop
 10 years ago
dfighter1985 6c153a30b4 CPack should use the install prefix. 
--HG--
branch : hotfix
 10 years ago
dfighter1985 ea3b16069b We need the LIGO config file, not directory in the first start settings dialog. 
--HG--
branch : hotfix
 10 years ago
dfighter1985 972d270bfc Merged in hotfix (pull request #105) 
Merge hotfix

--HG--
branch : develop
 10 years ago
dfighter1985 bdb633cf83 Use release squish if debug not found. Fixes s3tc compressor tool build. 
--HG--
branch : hotfix
 10 years ago
dfighter1985 e7066c1384 Some CPack renames. 
--HG--
branch : hotfix
 10 years ago
dfighter1985 35c870c793 Install tile editor's plugin spec to the right directory. 
--HG--
branch : hotfix
 10 years ago
dfighter1985 2d308dc6e7 Fixed build of Object Viewer Widget Qt ( old, not part of Studio ). 
--HG--
branch : hotfix
 10 years ago
dfighter1985 e21d926336 Merged hotfix 
--HG--
branch : develop
 10 years ago
dfighter1985 f902bf6ed6 Merged mainline 
--HG--
branch : hotfix
 10 years ago
dfighter1985 e311547a39 Initialize Nel3D in the Object Viewer plugin too. 
--HG--
branch : hotfix
 10 years ago
kervala 6205b16fbf Changed: Optimize sorting of files (instead of doing it several times for each directory, do it only once) 
--HG--
branch : develop
 10 years ago
kervala eea09d8893 Fixed: Guilds with same characters and not same spaces 
--HG--
branch : develop
 10 years ago
Nimetu 53f6adb041 Include chat message channel/type to chatlog file 
--HG--
branch : issue-221
 10 years ago
kervala b26e7f4c1b Fixed: Compilation 
--HG--
branch : develop
 10 years ago
kervala 3aa448ba24 Changed: Replaced atoi and atof by NLMISC::fromString 
--HG--
branch : develop
 10 years ago
kervala b70e8d3e7b Fixed: Compilation 
--HG--
branch : develop
 10 years ago
kervala 5ee2864491 Fixed: Compilation 
--HG--
branch : develop
 10 years ago
kervala 303f7d2e79 Changed: Minor changes 
--HG--
branch : develop
 10 years ago
kervala 704610668d Changed: Replaced ~0 by corresponding std::numeric_limits<T>::max() 
--HG--
branch : develop
 10 years ago
kaetemi dade81e02e Lightmap debug message 
--HG--
branch : develop
 10 years ago
kaetemi 1ab170b7d8 Unhide layers in max export 
--HG--
branch : develop
 10 years ago
kervala bc78734602 Changed: Fixed a wrong copy-paste 
--HG--
branch : develop
 10 years ago
kervala 8fc8c3aa39 Changed: Use defined directories prefixed by a default directory 
--HG--
branch : develop
 10 years ago
kervala 08c557ae76 Changed: Allow to use a readable and writable data path for IG patch (usefull when data are read only) 
--HG--
branch : develop
 10 years ago
kervala 3367eb3205 Changed: Append getAppBundlePath() to search paths under OS X 
--HG--
branch : develop
 10 years ago
kervala acf677e635 Changed: Don't use replaceApplicationDirToken anymore 
--HG--
branch : develop
 10 years ago
kervala 3bca3f41cc Changed: Typo 
--HG--
branch : develop
 10 years ago
kervala fad0e9af4e Fixed: Compilation with OS X SDK 10.10 
--HG--
branch : develop
 10 years ago
kervala e8ff07fe7d Fixed: Removed raw mouse mode for OS X too 
--HG--
branch : develop
 10 years ago
kervala 5b9ac59f49 Fixed: OpenGL driver compilation 
--HG--
branch : develop
 10 years ago
kervala 418e0ee7b7 Merge 
--HG--
branch : develop
 10 years ago
kervala 99c88bd515 Changed: Minor changes 
--HG--
branch : develop
 10 years ago
kervala 2869d5f1ac Fixed: OpenGL ES driver compilation 
--HG--
branch : develop
 10 years ago
kervala 0f22ea7777 Changed: More aliases for OpenGL ES functions and defines to simplify code 
--HG--
branch : develop
 10 years ago
Jan Boon d360f78a1c Merged in nimetu/ryzomcore/fix-issue-225 (pull request #98) 
CGroupEditBox: ignore enter key when ctrl is pressed (ctrl+m combo) (issue #225)

--HG--
branch : develop
 10 years ago
Nimetu 85f63b7db3 Fix html submit button value that is included with form data (issue #226) 
--HG--
branch : fix-issue-226
 10 years ago
Nimetu fbea1d2173 CGroupEditBox: ignore enter key when ctrl is pressed (ctrl+m combo) (issue #225) 
--HG--
branch : fix-issue-225
 10 years ago
kervala 4fc639671c Changed: Check for string length 
--HG--
branch : develop
 10 years ago
kervala ec12e6a75e Changed: Allow to enable UAC for Windows client 
--HG--
branch : develop
 10 years ago
kervala f745f82455 Changed: Give priority to Luabind library filenames with specific Lua version 
--HG--
branch : develop
 10 years ago
kervala 6596af9682 Changed: Minor changes 
--HG--
branch : develop
 10 years ago
kervala 3bfcd8644d Changed: Minor changes 
--HG--
branch : develop
 10 years ago
kaetemi 0a7462f7e1 Merge with hotfix 
--HG--
branch : develop
 10 years ago
kaetemi bb8eb7dcec Fix mirror type sizes 
--HG--
branch : hotfix
 10 years ago
kaetemi c03c0f532b Merge with default 
--HG--
branch : develop
 10 years ago
kaetemi f9c81f3740 ryzomcore/v0.11.2 
--HG--
branch : hotfix
 10 years ago
kaetemi 11ae94ab21 Move to feature-light_cycle: c5207e1f862a 
--HG--
branch : develop
 10 years ago
kaetemi b9d372b144 Backed out changeset: 3694176c26bf 
--HG--
branch : develop
 10 years ago
kaetemi a43fb4dba8 Move to hotfix: 287c1142e5ea 
--HG--
branch : develop
 10 years ago
dfighter1985 f189a98422 Ported changeset 9878ab4: CCtrlTextbutton checkcoords should call it's text's checkcoords method. Fix #219. 
--HG--
branch : develop
 10 years ago
dfighter1985 4d67a41f94 CCtrlTextbutton checkcoords should call it's text's checkcoords method. Fix #219. 
--HG--
branch : hotfix
 10 years ago
kaetemi 93d5ffddb6 Override sun direction from sky dome [breaks packed sheets] 
--HG--
branch : develop
 10 years ago
kaetemi eb2f4555b1 Also export non-root shapes 
--HG--
branch : develop
 10 years ago
kaetemi 5346da559e Merge 
--HG--
branch : develop
 10 years ago
kaetemi 0c77c91e95 Adjust sky batch 
--HG--
branch : develop
 10 years ago
kaetemi c3df884b13 Allow different light cycle for different continents [breaks packed sheets] 
--HG--
branch : develop
 10 years ago
kaetemi 44286f7ade Add sky batch script 
--HG--
branch : develop
 10 years ago
kaetemi f411d2b230 Fix choppy sky animation 
--HG--
branch : develop
 10 years ago
kaetemi 7fbe24f27f Merge 
--HG--
branch : develop
 10 years ago
kaetemi 7cb61f8796 Merge 
--HG--
branch : develop
 10 years ago