Commit Graph

1815 Commits

Author SHA1 Message Date
Lynix
850f8d78c0 Core/String: Consider tabspace as separator
Former-commit-id: c8bfab3e1a921f077c58f61479ddbf2e6bf747ef [formerly 145b8a1c022c4858adf924ce4951c1838507455e] [formerly c55fb22de534afc7d5cadaddac8d0c28c2eb85a6 [formerly 14128b77407ad492722db34dbd9a0f8b5d24a6a3]]
Former-commit-id: 1c100c34e020dcbc0a85318e2799b09bb97b7ab5 [formerly 3d89e9bbbb3b71ddc520600edce8be74f4c9889a]
Former-commit-id: ba244fd2eb84da614f84795fb2e01030fe7455b5
2016-08-05 09:08:45 +02:00
Lynix
af01e7242c Utility/MaterialData: Remove CustomDefined
Former-commit-id: 4c3c2012ae06bdc4679fed40ee6ad50027664a8f [formerly d0454f47bbecdbb2513d7afc629b00b53543f671] [formerly 07f50ad9e366215fc51280232c26cc8cdbf8236d [formerly 27fbbc6106dc22f72d3ddb382049672e82833cd8]]
Former-commit-id: e45fd2e87fcadbdf0a56c410d6c1ff36d9ea4b4a [formerly 0453e3ba57d326859fc78105b741cd7f1cb97bd6]
Former-commit-id: 9f7082ef9da8e8baefaef5c141e630ba99b32a83
2016-08-04 01:12:06 +02:00
Lynix
00fb383f70 Utility/MaterialData: Remove CustomDefined
Former-commit-id: a3051df8a12d596901043b142ee1fa55a2481644 [formerly 97b1364fc5ba7f22bb28479f0edb351db8e7cfff] [formerly 49730b561eda3f1350e87b2c99c48c04f45c849a [formerly e20bc09b46ea5a6555ef887b1db3a6f7f2b7cb3a]]
Former-commit-id: 78f2eff516042ec38f0f61ab9b4263d968c0488a [formerly c6e7d6d63628402d8a58cf8e95dbb0509d07ff03]
Former-commit-id: b269a6e53c5205aa27ef921f348367f1affde02e
2016-08-04 01:12:06 +02:00
Lynix
cf8224b9e1 Graphics: Change ParticleStruct_Sprite position and velocity type from Vector2f to Vector3f
Former-commit-id: 3e608a9622d6c759ca0d9cc42d5f5460a6e4488a [formerly b31994657a126489c141ca6bbd4f7745876b0fb3] [formerly 833df21d1208e31b5141dca3d9777c4822556ddd [formerly 638d3aa5c15845fc49c97727aa00aca2d670bedf]]
Former-commit-id: bb2418f3523c525691ebedf044b47314fcdec6bb [formerly 43c4cae99f5b0a20431e6118f2b134e0a930633f]
Former-commit-id: ffb8160b1574acd1063dab4ca151f420ff0940e8
2016-08-03 13:47:17 +02:00
Lynix
66bc8a5dde Graphics: Change ParticleStruct_Sprite position and velocity type from Vector2f to Vector3f
Former-commit-id: 8697752459c0f8a99c545ae41eedf6e0382c366e [formerly a855bebde268850fba035f3981e3e907acf33232] [formerly 2894f133ef2b92b49a0642df95393939269ee50b [formerly 348a5a1f8745537e3fb20a0aeac5e89a6f831c19]]
Former-commit-id: 50a4cef7ee7ac3be85cc9ccc6a6b194c4beb79f2 [formerly 49fdda2e6a597ed6251d822ff4b189442c5a9296]
Former-commit-id: ee48615b811e902841ff29529c15a6910fc8e1c1
2016-08-03 13:47:17 +02:00
Lynix
ca1b9c1988 Improved declarations
Former-commit-id: 567f98b44eada10ffb797cc19cfcdbca584a2461 [formerly 01826c3bfd8385abd6a47f770c7eba7980ae9199] [formerly 6c54c8e8e6a8515387fc61f665bfa5d2cc2d8cdf [formerly f507b9604c2395a4d1eec0f12a07e3cd8b47e4f6]]
Former-commit-id: 1723f76155d68f5aac2006f5ebf5bd96b4ac81e7 [formerly 04f3ed2688c3519923edbb0693e259ee3653256b]
Former-commit-id: e37a8744e6756f5eb331881b422d491171adb362
2016-08-02 13:31:09 +02:00
Lynix
a2fbd9f2d0 Improved declarations
Former-commit-id: fae51c9344fd88a35b6c6ebb825ba71e6ca33f1a [formerly 75901e046e5bbe5732846eed7ba7cdc3ebcc7bb2] [formerly c14ba82b5e7849ff610789fc4dca09aa67907200 [formerly f9dd4fd281c9b68aff9affef037d5ce1a3802fd7]]
Former-commit-id: 88f4d343858f42b06420f593efa6a481018e05fb [formerly 09a6ba61ac09ded89c59612aec2ab7263eb75e36]
Former-commit-id: 6268a2a01d13a27f79f18f6282023cac1a8579d4
2016-08-02 13:31:09 +02:00
Lynix
5fa5186480 Revert "Core/RefCounted: Remove persistent boolean"
This reverts commit db2ef3e90c3871290d114a9e6437b412e96c65aa [formerly a3f6ff88a25e63374eb6ce5b18269da2ba743b06] [formerly cfa12604fbb0da76fc27288b210ee1254a8b3a38 [formerly dee6ce858398e2de38ef1af00c1c630fd0126e09]] [formerly 1a23f0fddcd80ac33030061b7a00a3cfd43cb7fe [formerly d3cb17069c71449ae3f1cba6de55ea70f509e7a4] [formerly b2f8f82e9f3427310204f2e8a61d7bdfd96202d2 [formerly 5d117720d08d6d6243b3428d4b3f8aea1abef845]]].


Former-commit-id: 13a54266823fed88610753b1a90f4ef2c6fe932d [formerly 508d1a01cceee4a577063c684244fcf598ff6cb5] [formerly 2c99faae4d65dc222d05d2f98913a380b38d58ef [formerly 0117f7aec15e3db31cacdd0ef874064907c41ba8]]
Former-commit-id: 140d69126443b821a232a1a8b012712fc2e74b0f [formerly 501a63bd435f64d9da932279c90400ed95d0c1be]
Former-commit-id: d2d74a42d070eae9c1f158a59238c5f1ac40edb3
2016-08-02 13:20:34 +02:00
Lynix
6f265a1cb3 Revert "Core/RefCounted: Remove persistent boolean"
This reverts commit db2ef3e90c3871290d114a9e6437b412e96c65aa [formerly a3f6ff88a25e63374eb6ce5b18269da2ba743b06] [formerly cfa12604fbb0da76fc27288b210ee1254a8b3a38 [formerly dee6ce858398e2de38ef1af00c1c630fd0126e09]] [formerly 1a23f0fddcd80ac33030061b7a00a3cfd43cb7fe [formerly d3cb17069c71449ae3f1cba6de55ea70f509e7a4] [formerly b2f8f82e9f3427310204f2e8a61d7bdfd96202d2 [formerly 5d117720d08d6d6243b3428d4b3f8aea1abef845]]].


Former-commit-id: a7af09faec974d268de6680f2c0c16d531048935 [formerly 37761044d13cf2e2041c9eed9ff113a41efd87f8] [formerly ae05b7afb5f43daf90cd8182bf24c98067be4d16 [formerly 6633982a51ba117a749f08efda338455eabe59b3]]
Former-commit-id: a4c99f7c8c26a0c1276eb5262871a1964d470bfb [formerly 741d46a0838a64e92aaa46fe563493da10d62c98]
Former-commit-id: fe30e63aeb19e56fa64447bdd884766f84f305dd
2016-08-02 13:20:34 +02:00
Lynix
0e44e0eb15 Revert "Fix compile"
This reverts commit df4e466ee49accc9c19b2fe6da3c14e2779ca12b [formerly 752e14ea33208e0a1298a21b2be1c6aee56dfde1] [formerly a3eb1f7d2f090e0a63f64b3451198631e8d2c47e [formerly 4b89c5fafdc15330f909c62fd75a23885c7364e1]] [formerly 0b09aea025e4d8df0bdf33917571e81f1fe5c6a2 [formerly e192bf206e80f55897d26faf541bcc5afa0437fc] [formerly e9f0b2cd7d7dd709f6a0419b3ea4f6a599cbb823 [formerly 273f4a73bfed75ebec68969db3ae235ccec8600c]]].


Former-commit-id: ac8998b1a9ee363bcacfc3c9163e805cb1cbd93e [formerly 00d103e705e266c89cc508f3c4b06bab2b20bd4f] [formerly ba1b3fa7a77eb7e258234d5c12e89f0e883870cd [formerly cc0071350fc26ac76a1a49b2705b59871ac6c6f2]]
Former-commit-id: 6f83e8ded662a4ba85ab379f41809f541f83a628 [formerly 1ecb471c3812b741f0edd43e27ab0a1e567d8c18]
Former-commit-id: 4b0bd20ee74057669cce771c7a66520698980aa0
2016-08-02 13:20:31 +02:00
Lynix
b058819b9d Revert "Fix compile"
This reverts commit df4e466ee49accc9c19b2fe6da3c14e2779ca12b [formerly 752e14ea33208e0a1298a21b2be1c6aee56dfde1] [formerly a3eb1f7d2f090e0a63f64b3451198631e8d2c47e [formerly 4b89c5fafdc15330f909c62fd75a23885c7364e1]] [formerly 0b09aea025e4d8df0bdf33917571e81f1fe5c6a2 [formerly e192bf206e80f55897d26faf541bcc5afa0437fc] [formerly e9f0b2cd7d7dd709f6a0419b3ea4f6a599cbb823 [formerly 273f4a73bfed75ebec68969db3ae235ccec8600c]]].


Former-commit-id: c4f7092c80aaa52267789cffec29cd4bdd0890f5 [formerly d91460f5134fdca761c6152f72663cc8cdab7b88] [formerly 355bca8ae9dc9966992d43c2ebcdf693f1003af8 [formerly 8554f03b5f74c04ff6a7bb6c08de41eaf9cf0423]]
Former-commit-id: bd6254953c20e7971e70880d8598b6063ba21395 [formerly 43e67367ed1724862e9983598e843998688e46c0]
Former-commit-id: 11c10b5115995c7e96e0396032eeece6c301b90b
2016-08-02 13:20:31 +02:00
Lynix
f41bbfbf79 Fix compile
Former-commit-id: 7ae323d1a7816fdea1634325c5edf3a468089495 [formerly 51214a2f11742919093c73a60dc74910d2610be1]
Former-commit-id: 2b787569abc0dc73637dc5ecb43018b1766e2c28
2016-08-02 12:56:03 +02:00
Lynix
e8c89f158d Fix compile
Former-commit-id: b703781f87d0bd13e7e0436bb9ed5d20ef3cb09f [formerly 4a2bc52bfc39448000a6f3569fd8cfa657bc58ee]
Former-commit-id: 1e42734fafb9eb1a161cfcc3c781927f32c5ad07
2016-08-02 12:56:03 +02:00
Lynix
755bf0b04b Core/RefCounted: Remove persistent boolean
Former-commit-id: 6661b29e0e5e1dee8f4588688dc42865ce76e9ba [formerly 55e47c5ec3851e55243fb0e8e85d7fcc22f6cc1b]
Former-commit-id: 5442ab91a3a4b7da93c10bd06889785ac1faf034
2016-08-02 12:52:49 +02:00
Lynix
07725ceb03 Core/RefCounted: Remove persistent boolean
Former-commit-id: 99602e0fa1e54b6fc8e0087ef89d0e2c74bcfc15 [formerly 83374368c28b83e4916958e7a58d54ec663a9842]
Former-commit-id: 603d0c81eada7d1f25058163bbf97672cd96d08c
2016-08-02 12:52:49 +02:00
Lynix
fdfd078335 Build: Fix empty install commands
Former-commit-id: 42abd0d02836ee466821da11bc34bbe4acc30389 [formerly 0031006522b6c8910fae4c7b72eaf05cda23dcea]
Former-commit-id: 11ed91151aa8db729bea196ca9705a6e60f260bb
2016-07-31 12:59:04 +02:00
Lynix
554c17702b Build: Fix empty install commands
Former-commit-id: 7083dfd9716873707791d46bc1fe333a6e229712 [formerly a8122cb99bcf5023ffad732fbf8d2b922faf1252]
Former-commit-id: b9913ad6e47551044afd0259f9a1b64b82b1a743
2016-07-31 12:59:04 +02:00
Lynix
2468fd63a4 Graphics/ParticleGroup: Remove fixed step parameter (wasn't used)
Former-commit-id: 9e0d603d8bf47cb971bdacbaa662f3068d035515 [formerly afc7e78d0e517d87ea1239fea4105f6a07ab3aea]
Former-commit-id: 3c972ba5345592c2f35e1caf886ce6aa87560d4a
2016-07-29 13:55:59 +02:00
Lynix
e68b962f4d Graphics/ParticleGroup: Remove fixed step parameter (wasn't used)
Former-commit-id: 28e6d1d11ac699d184e9f0ca90994c1ae6368962 [formerly 696269b6f34dd4f9f61fd1c1f4b93bd2a50fdcdf]
Former-commit-id: d3fbf42609596a03cde0cdaf1256dd014e87087e
2016-07-29 13:55:59 +02:00
Lynix
f9d6f27e92 Utility/OBJParser: Abort parsing when there's more than one error per two line
Former-commit-id: 37075de6e7d10996af4c30ffcf74ead74b27905f [formerly 25597dd190b82dc40de1eaf7f4c75c9b058784ec]
Former-commit-id: 5383d58fd326b61cce4c415707dd06a0376e6dbe
2016-07-29 13:37:44 +02:00
Lynix
5d6cee8291 Utility/OBJParser: Abort parsing when there's more than one error per two line
Former-commit-id: b8126ca529f91492a1d116da7cb446b8eaa25a90 [formerly c33f7b8d27ba18303b839693aa3ef056d1f48ae1]
Former-commit-id: 701965304b9e51ddf1ee2233559f2f97d4a51894
2016-07-29 13:37:44 +02:00
Lynix
b273a08571 Graphics: Rename ParticleSystem to ParticleGroup
Preparing for integration into the ECS


Former-commit-id: 9ca871117d0be3d4c655225d3f3dad6b0277cdd8 [formerly 9343fd818957da74e0bb7a5715a2172eefc325e5]
Former-commit-id: 93cf58c80f0cd396211df0c95063f0ad05449e75
2016-07-29 13:24:19 +02:00
Lynix
9fa7267523 Graphics: Rename ParticleSystem to ParticleGroup
Preparing for integration into the ECS


Former-commit-id: 201e28c9f00ee31f809d9de3d9a37f57a7fe740c [formerly 9b88616308f9801482fc8811a9a19a7231dce2a7]
Former-commit-id: 579f4e9597f94620f922fb145931202d8fc9cc96
2016-07-29 13:24:19 +02:00
Gawaboumga
96dc8c001e Various fixes
Former-commit-id: 26dfbdb3388c845a6e3039f816f19ffbb462d7b8 [formerly a6437e0b6e48dbd630440f8d2629b32e4756b48e]
Former-commit-id: 8a1855fc1d4d7c343b7e1fdcd3c6a31f3134a59a
2016-07-28 19:22:41 +02:00
Gawaboumga
4c1c8dd2a9 Various fixes
Former-commit-id: bc799bb6b028f94a57c30dad8563367ab8a89973 [formerly 6c3e07c34170a8df0a4465d80cdfe9e5b8e04087]
Former-commit-id: e685bae1b31f698856efaf66d7bab8d96cb047f8
2016-07-28 19:22:41 +02:00
Lynix
4d307c07f9 Graphics: Add TileMap class
Former-commit-id: ecc9f3f1e786da4017ef24322a2f2510eab33a6c [formerly 2d18b57f6ef6c8480f83226082cfcceff3779093]
Former-commit-id: 531e4724efe7fa76f64c1e252665be31d1754e7b
2016-07-23 18:06:17 +02:00
Lynix
25d7112054 Graphics: Add TileMap class
Former-commit-id: 0a45b956501998a40a6406f7fff6e6cc85b4b4db [formerly ab84ea10c52b128b17241844e6a4b3887c6618ab]
Former-commit-id: d62bbb11f5205daa6af3f7b9152be3fb213ca564
2016-07-23 18:06:17 +02:00
Lynix
ceaac9be13 Renderer/RenderStates: Update RenderStates structure (preparing for renderer update)
Former-commit-id: 8839ceda70dfa0384e8da43205a208c89f1eb7bf [formerly f5434c9c44a52e02fdc6970e443cd7d3e9e99e6b]
Former-commit-id: 6a4846a2e2c8b60160598812ebd02da17a2f6947
2016-07-21 23:00:09 +02:00
Lynix
56443c91e4 Renderer/RenderStates: Update RenderStates structure (preparing for renderer update)
Former-commit-id: 392c7c33ff64d19e0fe3c7bdc8b22fe17c150887 [formerly d12a3c5f664fccebe0ee40a73bb0310e2d02287e]
Former-commit-id: 22743f015567a8471f97cb90a06175f600ef0f8f
2016-07-21 23:00:09 +02:00
Lynix
3b335ada9d Utility/OBJSaver: Fix multiple materials saving
Former-commit-id: 003f1dee7556318bb0c42b84ce178b4ee687c9a1 [formerly 17eb0eab5b018ef6a127ade58d4db4b815378dd0]
Former-commit-id: 0e984242a33c40c8f1a1ee0c0754ac24ea96d79d
2016-07-17 21:10:20 +02:00
Lynix
ef7759468a Utility/OBJSaver: Fix multiple materials saving
Former-commit-id: 18d8c235a58fc627bcc4ecbbe5cfcd8fcdf00014 [formerly 358b88c21f73a36051baed60a943643c3ae9b03c]
Former-commit-id: c1f89cb0f375db6c68048f0bc8e857306b6ca034
2016-07-17 21:10:20 +02:00
Lynix
4555a52317 Utility/Formats: Add OBJSaver (WIP)
Former-commit-id: d45e18a1c36ace696f07277923368540cca84850 [formerly 916fe15a35f125c17a318038ef417e34be878510]
Former-commit-id: fd5b56061baae2ceebbaa968b15ad5a01455d90e
2016-07-12 08:14:05 +02:00
Lynix
f814f5054e Utility/Formats: Add OBJSaver (WIP)
Former-commit-id: 8f5fab2823f86ff5b12348eacfe238c74281c235 [formerly 9c9ad4880ee31052ae1850c53e4781690ce69f49]
Former-commit-id: bde101aca68d5c6d205bb3d2252d656a6f7e078f
2016-07-12 08:14:05 +02:00
Lynix
d641336654 Utility/Mesh: Add MeshSaver properly
Former-commit-id: 8f6c3db5e5cd208a6a7b0b330ef3d8722fe38696 [formerly c87b832ede1355a7a1526aae0bcb402d4265ead7]
Former-commit-id: 1efc45f812129e86c6907e71d4523d77a1ceda12
2016-07-12 08:14:05 +02:00
Lynix
6084ff1707 Utility/Mesh: Add MeshSaver properly
Former-commit-id: 08a7fb99853e68e692e1346577c8d616c1f4a6f9 [formerly 626e980416ee0ceea15036bd6355321400a19475]
Former-commit-id: d39fd4d74d2d58c14057b0f769ceb7ce120c103a
2016-07-12 08:14:05 +02:00
Lynix
ab43085fe7 Utility: Add MTL exporting
Former-commit-id: cceef7a11d10cc235bd06655a7c5b10ee1cfdec6 [formerly e68c9322634c9a3f93771d941ae581f24dc98116]
Former-commit-id: 1a117f7cd11d869c1fb179cba54254c9ec6924f2
2016-07-12 08:14:05 +02:00
Lynix
ce8461ca35 Utility: Add MTL exporting
Former-commit-id: b524c2d445f4c5cdadedabc3a9c38307dbfecb9b [formerly d65160f4e3f2fa2c7c9ddd151c73990c6712b4c1]
Former-commit-id: 7ccdf043ccf793d3d9a5c9d93c65919ac015b52c
2016-07-12 08:14:05 +02:00
Lynix
269b0668cb Utility/Formats: Make MD2Loader specify diffuse texture path instead of material filepath
Former-commit-id: dc073017799c9cdbd74fc52f9f33cd4cba2f6967 [formerly 0f99dbc95d1787c1af9caa5143976690668f9dcf]
Former-commit-id: 2ae072cad50c2412da655c21f2f3798905d51b85
2016-07-12 08:14:05 +02:00
Lynix
2d2c34cb41 Utility/Formats: Make MD2Loader specify diffuse texture path instead of material filepath
Former-commit-id: a2aa5553318958c7bf809bb83ee775062d80dca3 [formerly d290eac77b0ab16b2ccfb394ca5da3d508b66bc7]
Former-commit-id: fb2b3a72ddfcd32562a6af726541367516f2adbf
2016-07-12 08:14:05 +02:00
Lynix
07c8cbd510 Utility/OBJParser: Fix mistake
Former-commit-id: 0e78ba2e8dbcbaa3891f2f789ffab854b7bd753e [formerly b7bbafa45b5e4e2ea4ffd0d796b24ce9ed007f58]
Former-commit-id: 60837af91b5e10d63ea4dfbe0fdec69ac3f97cfd
2016-07-12 08:14:05 +02:00
Lynix
9bd73098b1 Utility/OBJParser: Fix mistake
Former-commit-id: 33818e53f56d87be8138a0380d20aa3a79ddf5ae [formerly f7f5cafdeb378db42fe74bd983d3049b45a9f636]
Former-commit-id: 7e02c6e60c944941d2583ad8c96ac7c43ed66e94
2016-07-12 08:14:05 +02:00
Lynix
e4bdb3cdcb Utility/OBJParser: Prepare for saving
Former-commit-id: 5c22f8c9e0f3ab3c336598f24c1fbe8359eec9d9 [formerly e600681b453f363027e0a97a5625c7f8c6592f90]
Former-commit-id: 1eee39365464d38bfe13131b89c87660cfb05273
2016-07-12 08:14:05 +02:00
Lynix
1d193ec74a Utility/OBJParser: Prepare for saving
Former-commit-id: 245d757401397e329b906a4f48c913b434830475 [formerly da4af71db1570c669e82ab92c0a8a7a6301a5809]
Former-commit-id: 5b14b24fe157a1411a9f76d6374c18be82e254de
2016-07-12 08:14:05 +02:00
Lynix
970416b95e Core/ParameterList: Fix GetIntegerParameter
Former-commit-id: 1ae4359084a2707599cf2bda6fdb85bc2b2f35f5 [formerly 992c7be965f1a786b74b62bdacfb2883284ecc5f]
Former-commit-id: 7f74a8170f43d0dcd3689c38e6001f8bcf7ddebd
2016-07-08 18:02:19 +02:00
Lynix
fa1dae35f3 Core/ParameterList: Fix GetIntegerParameter
Former-commit-id: a7d0c83297d656a22f5688fed716b62ea15402c0 [formerly f45c562d8f8fdfe095c3f4b0dc7488da26332ff6]
Former-commit-id: 53c706e8e5f13898f6e1287336d12106fc28a6e3
2016-07-08 18:02:19 +02:00
Lynix
afc278ebd2 Utility/Mesh: Fix linking
Former-commit-id: 954ba6b61a949efaf21fcaa7e0bb28b414438181 [formerly 57fa786549e65d92c82c559d3ea710e8d88b5708]
Former-commit-id: 22e63411636bd8a345f01c823b15f3d1ad979455
2016-07-08 08:40:51 +02:00
Lynix
6c34b55bdd Utility/Mesh: Fix linking
Former-commit-id: 03c42c75e847592a08693b607270673838a47230 [formerly 077959728baeaf36fe3ad80cf0fb2e8b6cc7e7e9]
Former-commit-id: caae509fb871f0b05147f034c75403cafadd2959
2016-07-08 08:40:51 +02:00
Lynix
9aac187589 Utility/OBJParser: Fix mistake
Former-commit-id: a3bbd969e5fddb00011b3343356189df3864c615 [formerly c07e85fcbffe985fa7ac8f11e18160c1440306cc]
Former-commit-id: f218dce6fd6606ffc60d884914b31012d2e568b8
2016-07-08 08:38:34 +02:00
Lynix
a1a445d90d Utility/OBJParser: Fix mistake
Former-commit-id: 09440c600405f710e5f1c03cac353f6986830814 [formerly 3ce06ef4b0d7c941835580b080e8a73c853e13cf]
Former-commit-id: 21b606ff995a7192e5fa322b6eb11759ce274e39
2016-07-08 08:38:34 +02:00
Lynix
384e11bf79 Utility/STBSaver: Fix error message
Former-commit-id: 2ef6f33b8391a3c9fb595845f661cc9b1b79df87 [formerly 609d0b1dcc5484cdcca589f9f49061a4bda7c544]
Former-commit-id: 2cfd8315e60f7eb153642bd3012e6cbc4b88cb29
2016-07-08 08:36:54 +02:00