Commit Graph

347 Commits

Author SHA1 Message Date
Lynix 9ecfe31637 Build: Copy .dll only if host is Windows 2018-08-08 10:35:49 +02:00
Lynix 39d1d31639 Core: Integrated Unicode data 2018-08-03 20:24:56 +02:00
Faymoon 217d971fe7 fix launch error for premake (#167)
* fix error of launch for premake

* fix launch error for premake

* fix launch error for premake

* fix launch error for premake

* fix launch error for premake

* fix launch error for premake

* Update Generate_UnicodeData.bat

* fix launch error for premake

* fix launch error for premake

* fix launch error for premake
2018-06-28 16:12:12 +02:00
Lynix a4aad3caac Merge branch 'master' into vulkan 2018-06-12 19:08:02 +02:00
Lynix d7a2e9aad1 Merge branch 'ubo' into vulkan 2018-06-12 19:07:58 +02:00
Lynix 456f2b32e7 Build: Fix install/executable paths 2018-06-10 15:49:11 +02:00
Lynix efa727dfd4 Build: Fix thirdparty target dir 2018-05-21 19:28:33 +02:00
Jérôme Leclercq f864fc8a52 Build: Gather projects around categories 2018-05-16 12:55:36 +02:00
Lynix 43bb487801 Merge branch 'master' into vulkan 2018-04-26 22:48:49 +02:00
Jérôme Leclercq aa18355997 Delete Makefile which has nothing to do here 2018-04-24 22:08:30 +02:00
Jérôme Leclercq 8a1d61c3ea Merge branch 'master' of https://github.com/DigitalPulseSoftware/NazaraEngine 2018-04-16 12:56:15 +02:00
Lynix a48dc11063 Fix compilation in server mode 2018-04-14 00:08:50 +02:00
Alexandre Janniaux f8d1959d87 Fix gmake2 makefile by filtering gmake* instead of gmake
From a proposition of github.com/tdesveauxPKFX, filter on gmake*
generator instead of gmake so as to add library output directory.

Fixes #155
2018-04-02 20:45:03 +02:00
Lynix 7875ece869 Build: Fix platform module not being client-only 2018-02-25 18:21:42 +01:00
Jérôme Leclercq 7d54ac4c10 Merge branch 'master' into vulkan 2018-02-13 13:06:01 +01:00
Jérôme Leclercq 1feb4b2ba7 Build: defines NDEBUG in Release 2018-02-09 17:16:51 +01:00
Lynix db7f778672 Build self-hosted lib in a different folder and .gitignore it 2018-02-07 18:18:55 +01:00
Lynix 1c3654148d Merge branch 'master' into vulkan 2018-01-16 21:15:58 +01:00
germinolegrand 1e55c4d9e9 Prerequisites instead of Prerequesites (typo) #152 (#153) 2018-01-16 12:23:01 +01:00
Lynix 0b2d5b9332 Build: Improve coherence
This will prevent regeneration of the project for no reason.
There's a remaining bug with the units tests (which sometimes are processed before SDK, thus ending with less dependencies libraries)
2018-01-14 14:24:23 +01:00
Lynix 54015a9f44 Fix previous fix ... 2018-01-13 12:12:48 +01:00
Lynix dc9b8549dc Fix some chipmunk warnings 2018-01-13 12:08:23 +01:00
Jérôme Leclercq 26049ebc0e Add chipmunk source code
And upgrade it to 7.0.2
2018-01-11 14:09:14 +01:00
Jérôme Leclercq 588b7487f6 Rename extlibs to thirdparty 2018-01-11 12:57:42 +01:00
Lynix 61ecedfe8c Build: Merged extern workspace to main (and only) workspace
Also removed extern libraries precompiled binaries
2018-01-06 02:45:20 +01:00
Lynix 02d76aee5d Build: Fix exclusion not working 2017-12-02 14:39:40 +01:00
Lynix 547ad8682f Build: Add Category and possibility to excludes whole category with one command 2017-12-02 14:24:35 +01:00
Lynix 4c6b5d0546 Merge branch 'master' into vulkan 2017-11-24 20:14:39 +01:00
Jérôme Leclercq cb57721a65 Package: Fix resource copy on Linux 2017-10-10 21:52:33 +02:00
Jérôme Leclercq 15c37d1524 Build: Fix lua error in package.lua 2017-09-07 17:21:27 +02:00
Jérôme Leclercq b26d0d92d5 Build: Disable premake project by default 2017-09-07 16:50:54 +02:00
Jérôme Leclercq 3d7799ec62 Update build script to match Lua 5.3 and new Premake version 2017-09-07 16:23:43 +02:00
Jérôme Leclercq 2e832984ca Update Premake 2017-09-07 16:16:22 +02:00
Lynix 46d021c29c Commit weird newlines files 2017-08-30 18:09:16 +02:00
Lynix 4df9c94eb0 Build: Fix a missing config option 2017-08-30 15:16:35 +02:00
S6066 55ca4a84ea Added CheckboxWidget (#130)
* Started Checkbox Widget (buggy)

* Added features

* Added enabling feature

* Almost finished Checkbox

* Bugfix

* Bugfixes

* Use a better name

* Optimizations

* Added explicit colors

* ...

* changed lots of things

* Almost finished CheckboxWidget

* Almost almost finished

* Use better UTF8 box

* Edited encode resources script to encode SDK resources

* Finished checkbox widget

* Forgot to delete old function

* Forgot to delete todo comment

* Fix Travis compilation

* Fix Travis compilation a second time

* Fix Travis Compilation a third time

* Fix indentation

* Fix Files encoding

* Moved CheckboxState enum in (new) Enum.hpp

* Probably looks like more generated now

* Reorder CheckboxWidget members

* Reorder checkbox state members

* Reorder members 2...

* Oops

* Reorder members functions

* Fix encoding

* Fix files encoding

* Forgot to fix one file encoding

* Fix SDK Server

* Fix encoding again -_-

* Oops

* Optimize Checkbox Widget

* Fix .gitignore

* Removed .vs in gitignore

* Moved Enums into Widgets folder

* Bugfix

* Fix Encode Resources script

* Remove double line feeds

* Rename SetNextState to SwitchToNextState
2017-08-30 10:25:42 +02:00
Gawaboumga 5aa072cee3 New module: Platform - Split window management from Utility module (#128)
* New module: Platform - Split window management from Utility module

Final touch

* NDK/SDK: Bring back initialization of Utility
2017-08-30 10:22:50 +02:00
Lynix 9806231b5c Oops 2017-08-20 21:40:42 +02:00
Lynix 885804e58a Disable PremakeProject for non-Windows OSes 2017-08-20 21:37:45 +02:00
Lynix 596d65f1ed Merge branch 'master' into vulkan 2017-08-20 21:35:51 +02:00
Lynix a2a05f6d92 Build: Add PremakeProject config value 2017-08-20 21:33:42 +02:00
Lynix 973e3b094a Build: Add PremakeProject option 2017-08-14 01:59:17 +02:00
Lynix 9944a228b5 Merge branch 'master' into vulkan 2017-07-04 22:41:29 +02:00
Jérôme Leclercq eac2919551 Build/Package: Copy .pdb in the bin directory 2017-04-05 10:10:42 +02:00
Jérôme Leclercq f88174c8ca Woops again (works this time) 2017-03-06 13:20:02 +01:00
Jérôme Leclercq 8147b0807e Woops 2017-03-06 13:16:55 +01:00
Jérôme Leclercq d14574151a Build: Add AdditionalCompilationFlags build option 2017-03-06 13:11:17 +01:00
Jérôme Leclercq b4ecf563c1 Add pdb to package 2017-02-27 16:29:24 +01:00
Lynix 4aa2477c74 Merge branch 'master' into vulkan 2016-12-09 09:06:22 +01:00
Lynix 92d26ab18d Build: Add Configurations option (and add support for ReleaseWithDebug configuration) 2016-12-09 09:02:14 +01:00
Lynix 1334dc1fc2 Build: Little refactor 2016-12-09 08:58:19 +01:00
Lynix 2217cf9661 Merge branch 'master' into vulkan 2016-12-06 16:46:24 +01:00
Lynix e6e4a437bd Merge remote-tracking branch 'refs/remotes/origin/master' into gui 2016-11-30 13:08:08 +01:00
Lynix 8d86306933 Merge remote-tracking branch 'refs/remotes/origin/master' into culling 2016-11-23 14:07:52 +01:00
Lynix e0935edd00 Merge branch 'master' into vulkan 2016-11-21 00:32:57 +01:00
Lynix 84e3d8df9a Build: Enable RTTI on release
While the engine does not uses it, some projects using Nazara may use
RTTI and fail to compile
2016-11-20 15:21:27 +01:00
Lynix 46f2c18e20 Build: Enable relative links for makefile 2016-11-15 14:58:00 +01:00
Jérôme Leclercq 9e84c397ba Merge branch 'master' into culling 2016-11-07 11:26:48 +01:00
Jérôme Leclercq 2f11529669 Build: Enable big object only on Windows 2016-11-07 01:10:17 +01:00
Jérôme Leclercq 5d4595e9d6 Build: Enable -mbig-obj on Clang/GCC 2016-11-07 00:07:51 +01:00
Jérôme Leclercq 638467f879 Build: Fix codeblocks debug and object directory 2016-11-06 23:49:10 +01:00
Jérôme Leclercq 0f14a57b2e Build: Cleanup common.lua 2016-11-06 22:41:22 +01:00
Jérôme Leclercq 0de741a541 Build: Fix MSVC creating .a .. 2016-11-06 22:25:13 +01:00
Jérôme Leclercq 5e48f8b8b3 Build: Fix install commands 2016-11-06 22:04:47 +01:00
Jérôme Leclercq 6500d088e9 Build: Fix some premake5 weirdness
It seems some options are global and other local to the workspace (flags
and buildoptions could be defined outside of the workspace, defines
couldn't)
2016-11-06 21:59:48 +01:00
Jérôme Leclercq 88000ab2e4 Build: Upgrade to Premake5-alpha10, get rid of Premake4 2016-11-06 21:30:37 +01:00
Jérôme Leclercq 5aeb9f8d59 Build: Add CodeBlocks target to premake5 2016-11-06 11:17:19 +01:00
Lynix 86b892c3bc Regenerate Vulkan global include; add wrapper global include 2016-10-29 02:46:59 +02:00
Lynix 1df3201b39 Merge remote-tracking branch 'refs/remotes/origin/master' into vulkan 2016-10-28 18:46:51 +02:00
Lynix 28a2328371 Global headers: Remove the generation date
They should now generate the same input everytime
2016-10-28 17:53:03 +02:00
Lynix a4eccc9fac SDK: Add widget global header 2016-10-27 21:38:46 +02:00
Lynix df24519230 Merge remote-tracking branch 'refs/remotes/origin/master' into gui 2016-10-27 18:36:47 +02:00
Lynix 725dc6cdbc Merge remote-tracking branch 'refs/remotes/origin/master' into culling 2016-10-19 11:17:12 +02:00
Lynix a05f9222ee Build: Output plugins binaries to plugins/lib instead of plugin/NAME/lib 2016-10-17 14:14:17 +02:00
Lynix 683b3c8961 Sdk: Fix linking error since Physics module change 2016-10-14 17:47:46 +02:00
Lynix 9a7767867b Push the current work on the Physics2D module 2016-10-14 17:07:13 +02:00
Lynix eae8847bd1 Physics: Move files to Physics3D 2016-10-13 06:01:32 +02:00
Lynix fd652f1931 UnitTests: Include .hpp in the project 2016-10-13 05:08:57 +02:00
Gawaboumga d4e569c09e Add tests for event handling, use NazaraUnitTests [EventHandler] 2016-10-12 21:08:02 +02:00
Lynix 561c0cf51f Merge remote-tracking branch 'refs/remotes/origin/master' into culling 2016-10-12 16:51:18 +02:00
Lynix cf7465f7db Merge remote-tracking branch 'refs/remotes/origin/master' into vulkan 2016-10-11 17:24:03 +02:00
Lynix 05dd93c549 Merge branch 'master' into gui
Former-commit-id: b5a6eba7494e7595000e3c7e1f3c77077485519f [formerly 74e8b34c50d86cea8be86dcc5d9b82e112db9277] [formerly 07e6a0bd2e00dcb9517c6ddc1d9ca7d3326707ae [formerly 59878811e379ef9bfd66e6fd0a0f32eaa39dcc6b]]
Former-commit-id: b7a83377bc61d378410ce33748ab63357ee53abb [formerly d789d8762086eb0dd43e0cef08f1edfbd8d346f2]
Former-commit-id: 7aa71e252bf91965f8f488dd9396e6287607edf9
2016-10-10 22:10:36 +02:00
Lynix e86964936f Add server-side unit tests
Former-commit-id: 1db8c846b260cccaa6dc21590554cca469f5ffce [formerly 08a850f788da4d0d8b7c9ce5517fedf096c592d8] [formerly ae83af3d9153471ab88c285a4dd903e50460e1b2 [formerly e744d24dbc26b54a851c4fff0d166ea702fa1c1d]]
Former-commit-id: 8b0e0287c6a3f6fb456ff5c4a2f397ee3818d1d4 [formerly 35170cc7321b0bf5dcfe4813cd48b82afdb7ac07]
Former-commit-id: 525a0269014feb28795553339ca9d3621a36654a
2016-10-04 21:33:56 +02:00
Lynix 02c6144c99 Build/Package: Simplify code
Former-commit-id: de14600cdf1743f28f309fcc24d1070256901111 [formerly 9a57e456634a478f651c79d7d100af5385c9cb15] [formerly 343131484489da941cdca33470055f0daaffc197 [formerly 668828de25d45c455988ba6e4b8ee834dfdf9cb9]]
Former-commit-id: 7141674ad55cdd89ce2e5646b74fc08bff9f5e3b [formerly 5250e79e3fa22eaf3ebc2cae22d8d33a4feb7b30]
Former-commit-id: 9d109b01861ed8275fb95c95cd9f5d1b948f117c
2016-10-04 11:42:53 +02:00
Lynix e7499e2c33 Build/Package: Make bat file pause after packaging
Former-commit-id: f0b04a4d41a787a2442da7a35681280814380583 [formerly a0af806e47617ccabacad163e1ad7245c707d5cb] [formerly 4ab2f40cb7904394ddc2466fbd3603ee5d7a55e1 [formerly 0f16c04d796543292c22cf92e9d349c2cf3d38be]]
Former-commit-id: f6d5a53a6f5f6a7c583c985411ed48ef06d0c8b6 [formerly 96b7e9e96285bdd66c8b86c4925111bc54d20991]
Former-commit-id: 7a4cfe131e5b37e67c64d4da18e0fb670626109b
2016-10-04 11:27:08 +02:00
Lynix e234044290 Build/Package: Fix executable binaries not being packaged under Linux (Close #77)
Former-commit-id: 5c885f70af44968f33ee1dbd93646293bcea5d2e [formerly 8edfc3654005393c28e27f8c6cbe427a43152f3f] [formerly b66fb4ef5b275e63c649c336170f22bd3155f67b [formerly ac7655fa1c6e2e4d429dca86c5fd78a499481fd6]]
Former-commit-id: 0cf284996de8d81ddec55cbabda9d950d45f4d1b [formerly f11faabb2157f8f546a51ed27484b8d5859fbf7e]
Former-commit-id: 2a5c0b57a2451980b89c4dbe36e089dd13fabc3a
2016-10-04 11:26:45 +02:00
Lynix 3461eb49ca Disable RTTI everywhere and fix Linux compilation
Former-commit-id: c8c0f11725d2e5b6c6da6dc3ab11f0eda065094f [formerly c2977e388c70ba7ccdf52f9eb97d7fe71ed6f4cf] [formerly 73c0d0759a6c9cad05dff59bff486f99fde336b6 [formerly 96a6e52ba5c97fd3a107fed5d11738466bd53f7e]]
Former-commit-id: c6a193ee5ccb07a40a74719937dbf224ad22081e [formerly 5f275dc02a44bd2ee54f6d926338ddfe388f565b]
Former-commit-id: e35640a20ac2269f96b75998e56fcba2fdbf6f00
2016-09-30 14:15:19 +02:00
Lynix 59788a6aab Build/Package: Improve printing
Former-commit-id: c0b3bb1c20ed6b0fdcac34bd35e0c9fea6e5a46c [formerly 918686c05b0ac0cacbcd029a8ba95d1250dab731] [formerly fb1bdc4ec327c2b6588cb5fe4977a4fa23728a72 [formerly 9b359f94196467899e015de6107d2dd44c7037c1]]
Former-commit-id: a0d6e9386e7970e160655bd1da7e7594754a1635 [formerly f63b6d2e66666389f5fa1c595d5229bcd068b1b4]
Former-commit-id: ba34434a83785d2879a365ac324e3230bedec4ac
2016-09-29 18:00:05 +02:00
Lynix d2a7ac71ac Build/Package: Oops
Former-commit-id: 1473f3048ba321f5affa32c343b93f9d78ee2494 [formerly f6177c96cd49eebd8be2ea07fd3452b969e8e4fd] [formerly 31c4189bf4b58611ddfe25b8417b3ddd34f8b000 [formerly 114d8b74583d719ce8f43af3d4d8f3afcef99520]]
Former-commit-id: 7ec4eda49acc8e8cd4db28a09eff3a76cd75e5fd [formerly fdf8613068f8272875d060261ac31403a17a7130]
Former-commit-id: 579005e0c362929583eb81a68d12359f53f980f3
2016-09-29 16:35:24 +02:00
Lynix 1ef989871f Build/Package: Don't package common binaries for not exported binaries
Former-commit-id: fb577c02a91d8f016de017390641c0c1e26a5b58 [formerly 8dacd7053117130c72a8eefe98fd617f7193d186] [formerly daf3ea264c0aa476d57130698a35459685cecc4f [formerly d3153049d084af9680181933e3506202061ad98e]]
Former-commit-id: da7db81a78c07c060f16ec6cd51fb29137b2efc1 [formerly 215261f061170f3dcb09a843f64fd79d124e316b]
Former-commit-id: 69c613201f4d648d0c1f029f0303b23c1715c360
2016-09-29 13:52:26 +02:00
Lynix 7849eaf80f Build: Fix package on Linux/OS X
Former-commit-id: af859279daff0a3277885a129dbe0a3b64b670ee [formerly 9b5c746de0092b15a3a6b22e7b62c0d786511f74] [formerly c0deb3f2282e65eced2a847bfe96fade40000e0d [formerly 778655003cf7af0d129e08cf1241c0e7062cbc02]]
Former-commit-id: 1c43974f748ac73fb001ed826e33e6d65fa6be5a [formerly 860aaa09c8659b40712ecfbde1503098cb18d26f]
Former-commit-id: e13892bcca0dac59917554a6236ff53015c7cb2c
2016-09-28 17:51:26 +02:00
Lynix bd0c99c687 UnitTest: Enable RTTI
Former-commit-id: 99410bd952b14a187de04632ae041fd556a66e34 [formerly 85c10d4f7f2251c67cc14f1e7b10bac7092681e7] [formerly 4cd0ef1e6cbe595673dfb71ba82f4620dde4413e [formerly 3b7b24b4cad4e0abd4fb2faf7c9305ca75462028]]
Former-commit-id: 4419ea87112eb630430b46e5a8c0a3c155925df3 [formerly 83f3c7cab613c17d504484937fedca9ab09329ea]
Former-commit-id: 1455045645ef8e3ca74b49488b3d53adaf7e3d55
2016-09-28 13:55:27 +02:00
Lynix 7e908a5226 Build/Package: Improve package builder, add unit tests
Former-commit-id: 4dd27dd88564a8527dce268c3941f92804a55ade [formerly fdf45e4846285005a6dfccb940756b9d1b092b3a] [formerly 8f0ba428a30ab1716bc93545b7a5eb491176e600 [formerly d4a711f0813706bbd9ef094c4340e7dca2de92fe]]
Former-commit-id: 2fbcb21bda1b9660c2dbacd17571adb517342926 [formerly 75446e538072a1fae14aee28b528899be3c217ea]
Former-commit-id: e53d8b6e050f5887e86ff7d7825c514b725f936b
2016-09-28 13:06:48 +02:00
Lynix 3875d2abe2 Build: Make some fixes in order to prepare static building
Still not linking though


Former-commit-id: 3962a663c9368ea78c4703cc860beef8c440bb4b [formerly b9575a870528ef6712500a94c5223a74d5c6dbec] [formerly bf2ab7b17b25479d6a8fda660e8d9055ffce38de [formerly 3db6f9cbf4cedd9f91ef8f7f1bcc99a4e84027a4]]
Former-commit-id: 0c292fec84d1963f377d16d5e9a15337bef4620f [formerly 93c016fa10c60bf11e4b0b1e17d8c98a66dfa028]
Former-commit-id: 712b1bf14355a82be4cc2c37912f87039b3d9616
2016-09-27 18:10:13 +02:00
Lynix 939e28b990 Extlibs/Newton: Compile Newton with /MT
This way, using it with MinGW doesn't require any VS Runtime

Also removed debug library (they weren't used anyway)


Former-commit-id: e08a4da9f48fdfe3960df8e2bff8ba1db9fb34ef [formerly 47a55533f90c5a9bdf747b3f958f8b05b6a15994] [formerly 07f15ca5138d6f2334ea52ab30a6594cd531065d [formerly df5bfc827567e7df0aa5367d6cc85817987b3ce8]]
Former-commit-id: 24522fcbc867afd193fad3a0ec875181c018f568 [formerly 6983a21611959a73d99cc916e848e469c1270a98]
Former-commit-id: 979cce16b0f2fcf3ca0bf229b8b9f5801b73c929
2016-09-27 14:04:45 +02:00
Lynix d8788c8d09 Network/SocketPoller: Fix Linux implementation
Former-commit-id: f709da3636f60638461910570f8a03bf4acd1723 [formerly 8dd3f494efc40f9c652262903642155941620ac4] [formerly f4aeaca88e75efc00d818046d0a6e63a81db5af3 [formerly b5e70d0536e7d25e363b18e58d47122e3c90ca1e]]
Former-commit-id: 2ee713e85407fe7d44d3b1352f197da113cbe041 [formerly 9735f9b849062179207f4453a233a851c49431ea]
Former-commit-id: fc5e136d0be6123138623ba3d90b64475b8d81b4
2016-09-26 19:04:51 +02:00
Lynix a13b17573e Network/SocketPoller: Switch to epoll implementation on Linux
Former-commit-id: 1a4b998bff35b5aac411b053fe3dee48f1f6985c [formerly b7a50753347b629f708f21d85efc9e76e4b1bfc6] [formerly 7d59f9ff3d2173657cc5873209753fe64b59e2f2 [formerly 4c38f94a4a366ed290e605870e6f3c87e6decd7f]]
Former-commit-id: af5cc261c162ca3eebe5885acd5e2adfbd817984 [formerly 26e7b701e8dcafb7fb9c3537107729b2d0bfe354]
Former-commit-id: 00bd2c62ecdb5c493c4ec117dd2033d272f7143a
2016-09-26 18:34:06 +02:00
Lynix 72680be701 Build/UnitTest: Fix linking
Former-commit-id: ea7172090011baea8fda085f8f8d895e5537822b [formerly b00275cc5a01424a1d21d8a03e2022374f2a507c] [formerly 8e05dbc52e4233038ffae8ae6e5e0c0e00780a70 [formerly 798992ad419e11477b62711e249740393b56a01b]]
Former-commit-id: 82c971fcfe8baee74e5da16434e82deee1ce0862 [formerly 1cad1379fafea09668d8efbaa8d4558eb3657aec]
Former-commit-id: 557d01842da1234ebdd066ee9cd3c2f84f8fd769
2016-09-26 14:10:03 +02:00
Lynix 48c0315ea6 Build/Package: Fix copy of Nazara binaries/libraries in case of subdirectory detection
Former-commit-id: 2d9c61f9b2bf807713006e3b07b1b75a1774bf4a [formerly 21dce208c2e7be41bf41f5b80f4f4e2b04958138] [formerly f0ae51fedea218bd271bb428ba3a4e0716448ab9 [formerly 42d377e32c3c37a20ff397fbcdefb6544be592ec]]
Former-commit-id: 369f2d92b951e25c58069efdb8025f98200f0fd9 [formerly 505203a72e7e234bab68e55a25bdf1b5bdae1c5b]
Former-commit-id: 676549eda0b4d80f310e3c75994fef339dfa406b
2016-09-25 02:42:40 +02:00
Lynix 10a1e16566 Build: Add package action
Former-commit-id: 515307c1cb9d10f2a6060f7ae107b969637e8882 [formerly bcb26c49c374e502732e3bff35f8367047accdc5] [formerly 72385d39c30f735fb43d70da3c44840468360efa [formerly 6563ce60169674309fdf8e36e16686b1b0be128e]]
Former-commit-id: fbc9522ed2c0e75f58a3517344d780be3eb99ac4 [formerly ce264fe175de40c051229183d458273ad6cbead1]
Former-commit-id: e312993f3cab7e1587bc09feb0e25ec289237224
2016-09-25 01:56:05 +02:00