mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-30 03:44:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,794 Commits 81 Branches 74 Tags 83 MiB
72c741d8ea
Commit Graph

704 Commits

Author SHA1 Message Date
Christophe Riccio
b0b84a3dc1 Optimized sign for vector types #271 2014-11-21 00:50:47 +01:00
Christophe Riccio
88894045af Added integer log2 test 2014-11-19 00:40:45 +01:00
Christophe Riccio
2d50df61c3 Initial structure for GTC_integer 2014-11-17 23:56:41 +01:00
Christophe Riccio
3adf263341 Added GLM_FORCE_EXPLICIT_CTOR to require explicit type conversions #269 2014-11-17 22:59:10 +01:00
Christophe Riccio
1a4bc0d8a5 Added more geometric function tests 2014-11-16 20:52:54 +01:00
Christophe Riccio
bc5fe52a44 Removed empty GTC_integer 2014-11-16 16:42:47 +01:00
Christophe Riccio
9c65087f90 Fixed build on VC2010 2014-11-16 01:13:01 +01:00
Christophe Riccio
2d48d922bd Updated VC support compilers list 2014-11-16 01:12:18 +01:00
Christophe Riccio
72cbc4c065 Fixed uaddCarray and updated tests #253 2014-11-15 22:31:08 +01:00
Christophe Riccio
b90c4c430e Added GLM_HAS_TRIVIAL_QUERIES define 2014-11-15 21:59:46 +01:00
Christophe Riccio
0ff773a46a Added force CXX98 test 2014-11-15 21:59:28 +01:00
Christophe Riccio
45645988e9 Fixed uaddCarray #253. Fixed GCC build errors. 2014-11-15 21:32:56 +01:00
Christophe Riccio
5960196ce8 Clean up white spaces, fix build with VC15 2014-11-15 20:36:53 +01:00
Christophe Riccio
db4be24897 Fixed test build on ICC 2014-11-15 13:19:35 +01:00
Christophe Riccio
3716995414 Fixed white spaces 2014-11-15 00:56:14 +01:00
Christophe Riccio
141c1856a7 Removed <iostream> in GLM tests, use <cstdio> instead 2014-11-15 00:49:12 +01:00
Christophe Riccio
d606eaf2da Clean up white spaces 2014-11-15 00:32:40 +01:00
Christophe Riccio
191dbe92dc Added dualquat trivially copyable test. #263 2014-11-15 00:30:28 +01:00
Christophe Riccio
16a0c960f7 Move more performance tests inside GLM_PERF_ENABLE 2014-11-15 00:20:56 +01:00
Christophe Riccio
0b8ca1a5b6 Added a CMake option to execute GLM performance tests. Made quat and dualquat trivially constructible #263 2014-11-15 00:05:52 +01:00
Christophe Riccio
b7b8b18f83 performance test for fast_trigonometry #265 2014-11-14 21:36:59 +01:00
Christophe Riccio
c36f3630eb Fixed glm::mask function and tests 2014-11-14 02:01:46 +01:00
Christophe Riccio
a604ebdaa5 Fixed build 2014-11-13 00:08:13 +01:00
Christophe Riccio
2df3bf71cc Merge branch 'trivial' into bitfield 2014-11-12 23:11:32 +01:00
Christophe Riccio
062ee19ac7 Fixed bitfieldInsert and bitfieldExtract 2014-11-12 22:48:15 +01:00
Christophe Riccio
debe75a6e1 Added trivially copyable test 2014-11-12 21:45:12 +01:00
Christophe Riccio
ee84420f6c All *mat* types are copyable #263 2014-11-10 01:16:48 +01:00
Mathias Labeyrie
b3bdf83bd8 rename some vars 2014-11-05 15:24:47 +01:00
Mathias Labeyrie
ef1c33d2d5 test perf fastAtan 2014-11-05 15:20:53 +01:00
Mathias Labeyrie
a7b3fca0b2 test perf fastAsin 2014-11-05 15:06:07 +01:00
Mathias Labeyrie
43387c81de test perf fastAcos 2014-11-05 15:05:33 +01:00
Mathias Labeyrie
c4b5fa2a93 test perf fastTan 2014-11-05 15:02:26 +01:00
Mathias Labeyrie
74cfc7451a test perf fastSin 2014-11-05 15:02:17 +01:00
Mathias Labeyrie
183c7141e2 performance test for glm::fastCos 2014-11-05 14:44:51 +01:00
Christophe Riccio
a2a6037ba5 More std trivial experiments #263 2014-11-04 01:06:16 +01:00
Christophe Riccio
931e72b456 Initial std trivial experiments #263 2014-11-04 00:52:16 +01:00
Christophe Riccio
6f3765d281 First draft of GTC_round 2014-11-04 00:06:20 +01:00
Christophe Riccio
377d5a4046 Optimized bitCount function 2014-11-02 23:48:02 +01:00
Christophe Riccio
c62b6c7324 Added bitcount/pop implementation perf tests 2014-11-02 21:18:46 +01:00
Christophe Riccio
afb1f6d152 Optimized bitfieldReverse 2014-11-02 20:48:59 +01:00
Christophe Riccio
41c00872a1 Fixed GCC build 2014-11-01 23:35:10 +01:00
Christophe Riccio
c839f52697 Fix warnings 2014-10-29 10:35:19 +01:00
Christophe Riccio
abb5299e08 Fixed warnings with -pedantic 2014-10-29 10:28:25 +01:00
Christophe Riccio
9fe8bc1f66 Fixed build 2014-10-29 08:30:18 +01:00
Christophe Riccio
dced21e745 Added multiple 'sign' implementations for integers, unit tests and performancetests. 2014-10-29 00:18:41 +01:00
Christophe Riccio
378074ee66 Merge branch 'vectorize' of https://github.com/g-truc/glm into vectorize 2014-10-28 20:32:01 +01:00
Christophe Riccio
d07a846539 Added sign function implementations and performance tests 2014-10-28 20:31:39 +01:00
Christophe Riccio
44382faf59 Improve mask implementation to support any integer and vector types 2014-10-28 20:28:26 +01:00
Christophe Riccio
a88d8935be Updated ceilPowerOfTwo for signed int support 2014-10-27 23:02:47 +01:00
Christophe Riccio
3420d691f5 Added findLSB tests, faster ceilPowerOfTwo 2014-10-27 20:47:00 +01:00
Christophe Riccio
f09d1fd3d4 Fix build 2014-10-27 13:44:30 +01:00
Christophe Riccio
097c1f7b90 Updated GTC_integer 2014-10-26 20:34:10 +01:00
Christophe Riccio
d3b368b65c Added GTC_integer, deprecated GTX_bit 2014-10-26 19:22:19 +01:00
Christophe Riccio
eaa3b72b99 Added isPowerOfTwo tests 2014-10-26 17:43:54 +01:00
Christophe Riccio
8dd3ec02ea Removed bitRevert, duplicated of bitfieldReverse 2014-10-26 16:56:31 +01:00
Christophe Riccio
087d6292e3 Added GTC_bitfield extension, promoted GTX_bit 2014-10-26 00:22:08 +02:00
Christophe Riccio
1b6b8183a0 Updated test 2014-10-25 21:57:06 +02:00
Christophe Riccio
0c522117c8 Opimization of mask, bitfieldInsert, bitfieldExtract and bitCount 2014-10-25 21:16:49 +02:00
Christophe Riccio
eb915ed808 Fixed frac and added more roundEven tests 2014-10-25 14:30:43 +02:00
Christophe Riccio
bf9e4458b6 Added not function 2014-10-24 21:22:24 +02:00
Christophe Riccio
72a2f49834 More integer vectorization 2014-10-24 02:46:59 +02:00
Christophe Riccio
679c765a07 vectorize bitfieldExtract 2014-10-21 03:08:32 +02:00
Christophe Riccio
2179695e02 Added usubBorrow tests 2014-10-21 01:40:42 +02:00
Christophe Riccio
4fc68ffe49 Replace function instanciations with macros by templates 2014-10-20 03:26:59 +02:00
Christophe Riccio
bf08a0e234 Replace function instanciations with macros by templates 2014-10-20 02:03:48 +02:00
Christophe Riccio
0042517167 Replace function instanciations with macros by templates 2014-10-20 00:34:59 +02:00
Christophe Riccio
0813facc58 Updated compiler detection code 2014-10-18 22:43:15 +02:00
Christophe Riccio
14d86e5718 Removed unsupported compiler defines 2014-10-18 13:20:05 +02:00
Christophe Riccio
327c7917fb Fixed cases of unspecialized simd 2014-10-18 02:34:20 +02:00
Christophe Riccio
8a1bf4410b Completed GTC_vec1 2014-10-15 02:53:46 +02:00
Christophe Riccio
19e239d466 Fixed core_setup_message test with Visual C++ 2014-10-12 20:57:41 +02:00
Christophe Riccio
85037a164f Fixed GLM_FORCE_SIZE_FUNC and added test #245 2014-10-12 20:50:50 +02:00
Christophe Riccio
c2d542562e Fixed GLM_FORCE_SIZE_FUNC support overlook #245. Added uninitiallized constructor to quaternion. Fixed lack of conscistency or quaternion constructors with other types. Various uninitilized constructor optimizations 2014-10-12 01:24:28 +02:00
Christophe Riccio
75939a7960 Fixed GTX_string_cast to support for integer types #249 2014-10-10 01:21:04 +02:00
Christophe Riccio
f9484a6e9f - Moved template types from 'detail' to 'glm' namespace #239, #244 2014-10-05 19:37:07 +02:00
Christophe Riccio
7ab7d4beb8 Merge pull request #240 from Jaxan/range 
Range support #240
 2014-10-05 14:24:19 +02:00
Christophe Riccio
a00fc3fdf4 Enable only GLM_GTX_scalar_multiplication for C++11 compiler #242 2014-10-05 13:26:02 +02:00
Joshua Moerman
62ac07815c Adds scalar multiplication for all types 2014-09-22 10:03:18 +02:00
Joshua Moerman
77c704e210 Adds range support 2014-09-19 16:27:23 +02:00
Christophe Riccio
46e61b4f07 Added test for fastSin #231 2014-09-16 01:35:29 +02:00
Christophe Riccio
ec513f4466 Added GTX_common with isdenomal #223 2014-09-07 20:53:35 +02:00
Christophe Riccio
bfa893b957 Fixed signed integer and float linearRand results #230 2014-09-07 00:57:21 +02:00
Christophe Riccio
5f7862ebec Improved linearRand: support precision and integers (#230) 2014-09-06 21:52:51 +02:00
Christophe Riccio
e419448539 Fixed compile problems with glm::max( vec, int ) #232 2014-09-06 02:24:50 +02:00
Christophe Riccio
ac3c2e37f1 Rely on STL functions for GLM functions using the same prototype #233 2014-09-06 01:45:13 +02:00
Christophe Riccio
eabeb0471b Merge branch '0.9.6' 2014-08-31 18:37:14 -04:00
Christophe Riccio
67c62d8b1c Merge branch '0.9.6' of https://github.com/g-truc/glm into 0.9.6 2014-08-31 18:12:53 -04:00
Christophe Riccio
3b7aadc2e3 Added initial commit for GLM_GTX_matrix_decompose #227 2014-08-31 18:12:38 -04:00
Christophe Riccio
2b747cbbad Removed last references to GLM_FORCE_RADIANS 2014-08-04 00:10:12 +02:00
Christophe Riccio
fa6bec2f3d Added swizzle contructor tests 2014-08-03 23:40:45 +02:00
Christophe Riccio
8b7d3daa34 Added vec1 operator tests 2014-07-28 23:46:46 +02:00
Christophe Riccio
d722b398c9 Added scalar conversion constructor 2014-07-28 22:08:09 +02:00
Christophe Riccio
4fa38c7a03 Fixed warning 2014-06-21 16:29:06 +02:00
Christophe Riccio
7f3c56f278 Removed GCC warning 2014-06-21 16:00:17 +02:00
Christophe Riccio
9f0fe30585 Fixed build 2014-06-21 13:22:06 +02:00
Christophe Riccio
7097e4c7c8 Fixed tweakedInfinitePerspective #208 and added user-defined epsilon to tweakedInfinitePerspective 2014-06-20 22:13:06 +02:00
Christophe Riccio
95cd2c8b24 Added #214 issue tests. 2014-06-20 20:06:41 +02:00
Christophe Riccio
84e05bbbb3 Added test for issue #214 2014-06-20 01:46:28 +02:00
Christophe Riccio
7fe8a1944c Fixed fastDistance ambiguity #215 2014-06-20 01:09:50 +02:00
Christophe Riccio
83f594b5ed Fixed quaternion mul/vec test 2014-06-19 23:05:35 +02:00
Christophe Riccio
c440b9515a Merge io for GLM types #144 2014-06-15 22:52:23 +02:00
Christophe Riccio
a1a861a4a6 Merge pull request #210 from moushkka/0.9.5 
Fixed linear interpolation when cosTheta is close to 1 in quaternion slerp #210
 2014-06-12 19:27:22 +02:00
Christophe Riccio
c506b43d49 Quaternion vector rotation error. #209 2014-06-12 00:29:56 +02:00
Joel Nises
e610e9446e fixed bug in quaternion slerp 2014-06-05 17:48:53 +02:00
Christophe Riccio
a2b70690c1 Added test gor issue #199 2014-05-04 17:34:34 +02:00
Christophe Riccio
d77bfa1a70 Fixed GTX_color_space - saturation #195 2014-05-04 17:20:40 +02:00
Roger Leigh
34bd28e8c6 cmake: Don't build tests when not testing 2014-04-15 10:46:45 +01:00
Christophe Riccio
e33136538d - Fixed eulerAngle*** not consistent for right-handed coordinate system (#173) 2014-03-31 23:50:15 +02:00
Christophe Riccio
12cde2bf75 Added eulerAnglesX tests 2014-03-31 02:00:51 +02:00
Christophe Riccio
3f327d5e70 Fixed usubBorrw 2014-03-16 12:33:00 +01:00
Christophe Riccio
efd4087b1c Fixed int used instead of glm::length_t 2014-03-15 22:33:25 +01:00
Christophe Riccio
233847ebfb Added vec2 length test 2014-02-25 19:12:52 +01:00
Christophe Riccio
ae2af04599 Updated release with GTX_matrix_transform_2d and added blank unit test file for the extension. (#176, #178) 2014-02-21 02:18:53 +01:00
Christophe Riccio
9eedee586d Added instruction set report and clean up output 2014-02-09 15:06:10 +01:00
Christophe Riccio
31ec3eed97 Clean up initializer list code. 2014-02-08 19:08:09 +01:00
Christophe Riccio
6aa34be6ad Fixed GLM_FORCE_RADIANS with <glm/ext.hpp> build error (#165) 2014-02-08 13:43:32 +01:00
Christophe Riccio
a310855d23 Fixed undefined reference to fastInverseSqrt (#161) 2014-02-08 13:34:40 +01:00
Christophe Riccio
1d981dd344 Fixed initializer list ambiguity (#159, #160) 2014-02-08 12:40:34 +01:00
Christophe Riccio
d7862e4bb5 Fixed SSE code included in GLM tests on pure platforms 2014-01-14 14:07:09 +01:00
Christophe Riccio
dd272c52ee Fixed non power of two matrix products 2014-01-13 23:41:11 +01:00
Christophe Riccio
aeba3c6fe7 Quiet most GLM_FORCE_RADIANS messages 2014-01-11 21:12:53 +01:00
Christophe Riccio
3394af0cf2 Fixed build on GCC 2014-01-11 19:45:40 +01:00
Christophe Riccio
90a249b5ff Optimized matrix inverse and division code (#149) 2014-01-11 16:44:15 +01:00
Christophe Riccio
ccb25c84c7 Update copyright year 2014-01-04 22:32:28 +01:00
Christophe Riccio
aa26672da1 Fixed inverse link error when using namespace glm; (#147) 2014-01-04 16:34:11 +01:00
Christophe Riccio
6f096fbb31 Fixed vector and matrix queries 2014-01-04 14:57:59 +01:00
Christophe Riccio
06ac77dad4 Fixed declaration and definision mismatches (#148) 2014-01-04 13:55:37 +01:00
Christophe Riccio
26e02fad68 Added initializer list for vectors 2014-01-04 12:46:47 +01:00
Christophe Riccio
71035db795 Added ULP comparison between lowp and highp for inversesqrt 2013-12-28 03:45:18 +01:00
Christophe Riccio
40c772341a Fixed white space 2013-12-27 01:30:19 +01:00
Christophe Riccio
d252dd243b Added possible static_cast conversion of GLM types (#72) 2013-12-27 00:49:53 +01:00
Christophe Riccio
e5f8ebbfd7 Tests to reproduce bug #135, could not reproduce it 2013-12-26 20:38:28 +01:00
jan p springer
39179ba1ad un/formatted() usage to un/formatted 2013-12-26 15:15:53 +00:00
Christophe Riccio
36de7ea9e9 Clean up 2013-12-26 13:14:50 +01:00
Christophe Riccio
6b2ecaaf42 Clean up 2013-12-26 02:46:34 +01:00
Christophe Riccio
fd256dfaa8 Updated GLM manual with per feature headers. Fixed io. 2013-12-25 23:21:46 +01:00
Christophe Riccio
9f8112f93a Reduced dependencies of GTX extensions. Removed some deprecated code. 2013-12-25 04:16:08 +01:00
Christophe Riccio
950eaa45cb Reduced dependencies for GTC extensions 2013-12-24 13:45:14 +01:00
Christophe Riccio
6f7eb97b87 Move content of core directory into detail directory. Reduced dependencies to glm.hpp. 2013-12-24 10:41:59 +01:00
Christophe Riccio
aa318f6a43 Fixed GTX_mixed_product build 2013-12-18 19:16:42 +01:00
jan p springer
0e3cebf23a removed boost dependencies 2013-12-18 10:34:06 +00:00
jan p springer
623cdaa552 reimplemented io support for basic types 2013-12-17 22:37:34 +00:00
Christophe Riccio
fa56944171 Fixed GTX_io test 2013-12-16 23:59:20 +01:00
jan p springer
0f66a02c2a added: op<< for glm types 2013-11-22 23:48:58 +00:00
jan p springer
e299af614f added: quat::op+=(quat) and quat::op*=(quat) 2013-11-22 21:46:30 +00:00
jan p springer
137b296556 fixed: commented unknown structure member (gcc4.8.2,f19,x86_64) 2013-11-22 21:35:06 +00:00
jan p springer
2a52f56360 fixed: printf -> std::printf and missing include 2013-11-22 21:32:33 +00:00
Christophe Riccio
dadab89566 Merge branch '0.9.5' of https://github.com/g-truc/glm into 0.9.5 2013-11-10 13:47:52 +01:00
Christophe Riccio
ffbcd7f6bd updated comments 2013-11-10 13:47:13 +01:00
Christophe Riccio
fbb54649b7 Added test files and fixed build errors for experimental extensions. 2013-10-27 22:38:22 +00:00
Christophe Riccio
2e72af3f6d Added test files for all GTX extensions 2013-10-27 18:25:03 +00:00
Christophe Riccio
4acd5b087d Added assert for initilizer lists to match sizes 2013-10-05 21:03:53 +02:00
Christophe Riccio
eb59cb9af6 Fixed initializer test implementation, simplified packing implementation 2013-10-05 20:06:56 +02:00
Christophe Riccio
5ea160413d Completed initializer list tests 2013-10-05 14:02:33 +02:00
Christophe Riccio
2d5724e23a Added more initializer lists tests 2013-10-01 01:31:57 +02:00
Christophe Riccio
9b1f079856 Added C++ 11 initializer list for matrix types 2013-10-01 01:12:21 +02:00
Christophe Riccio
2badec664f Merge branch '0.9.5' of https://github.com/g-truc/glm into 0.9.5 2013-09-30 03:51:40 +02:00
Christophe Riccio
81ed43373f Fixed mat4 initializer list contructors 2013-09-30 03:50:40 +02:00
Christophe Riccio
d656658849 Added initializer_list contructor test 2013-09-30 03:17:54 +02:00
Christophe Riccio
812ff4fcc8 Initializer list experiment 2013-09-30 02:36:04 +02:00
Christophe Riccio
b51fe09cb9 Fixed build 2013-09-30 02:05:13 +02:00
Christophe Riccio
5dc52c722c Added mat4 initializer experiment 2013-09-30 00:43:48 +02:00
Christophe Riccio
71855943e0 Added initializer lists 2013-09-29 19:44:59 +02:00
Christophe Riccio
5d7c896a3f Fixed build on Visual C++ 2005 2013-09-24 01:21:55 +02:00
Christophe Riccio
1e69dfe30e Added a quation constructor taking two axis 2013-09-22 23:37:55 +02:00
Christophe Riccio
61589b8a28 Added a GTX_euler_angle unit test 2013-09-18 23:05:50 +02:00
Christophe Riccio
08c95429fe Fixed build on GCC 2013-09-17 23:56:46 +02:00
Christophe Riccio
52d86dcc19 Fixed merge 2013-09-17 23:30:37 +02:00
Christophe Riccio
dbef0b4eb5 Fixed build 2013-09-17 22:51:39 +02:00
Christophe Riccio
33a482a6be Added GCC49 detection 2013-09-17 22:51:24 +02:00
Christophe Riccio
b258af3e67 Fixed B /= B.y bug for all assignment operators of vector classes. #116 2013-09-17 21:37:40 +02:00
Christophe Riccio
dddcbe58e6 Factorized float to uint and co function code. 2013-09-17 01:06:45 +02:00
Christophe Riccio
4707333a58 Added std::round test 2013-09-16 03:14:44 +02:00
Christophe Riccio
d37d3539ed - Fixed ldexp implementation 
- Increased assert coverage
- Increased static_assert coverage
- Replaced GLM traits by STL traits when possible
- Allowed including individual core feature
 2013-09-16 03:03:49 +02:00
Christophe Riccio
b72ce6addc Swizzle operators are disabled again by default... :/ 2013-09-15 20:44:33 +02:00
Christophe Riccio
1d9e6dc95c Enabled swizzle operator by default, removed GLM_SWIZZLE and add GLM_SWIZZLE_RELAX for Visual C++ lang extension implementation. 2013-09-15 17:55:05 +02:00
Christophe Riccio
ca3927b61a Fixed swizzle tests 2013-09-15 14:40:21 +02:00
Christophe Riccio
8658704bf6 Merge branch '0.9.5' of https://github.com/g-truc/glm into 0.9.5 2013-09-11 01:09:21 +02:00
Christophe Riccio
08ada74f36 More precise C++ features detection 2013-09-11 01:06:11 +02:00
Christophe Riccio
6d2170adb3 Fixed C++11 activation on XCode for the CMake test suite ID 2013-09-10 19:58:02 +02:00
Christophe Riccio
cd186dadb3 Optimized packing and unpacking functions 2013-09-08 17:56:18 +02:00
Christophe Riccio
98a277d6af Removed a static_assert 2013-09-08 15:17:45 +02:00
Christophe Riccio
0ff1026dbb Removed value_type and size_type 2013-09-08 02:30:16 +02:00
Christophe Riccio
b9266c07b0 Using C++ casts 2013-09-08 00:22:17 +02:00
Christophe Riccio
f511121559 Merge nohalf 2013-09-06 02:17:09 +02:00
Christophe Riccio
e413381fad Merge 2013-09-06 02:14:15 +02:00
Christophe Riccio
16b9c79acc Added implicit conversion of types with different precision qualifier 2013-09-02 00:16:41 +02:00
Christophe Riccio
635d2d0eca Fixed GTC_packing build 2013-09-01 18:22:47 +02:00
Christophe Riccio
8e955736ac Removed GTC_swizzle 2013-08-31 12:00:10 +02:00
Christophe Riccio
36a5f1cc20 Fixed merge 2013-08-31 11:53:05 +02:00
Christophe Riccio
0464c836cb Fixed merge 2013-08-31 11:50:30 +02:00
Christophe Riccio
4ed278b9c7 Fixed merge 2013-08-28 10:57:51 +02:00
Christophe Riccio
4b7862b314 Fixed issues with ref types for l-value swizzle operators 2013-08-27 13:50:55 +02:00
Christophe Riccio
bc72fafdd9 Removed multiple component selection code 2013-08-27 11:35:58 +02:00
Christophe Riccio
6e82d7ba31 Remove unsupported compiler detection 2013-08-27 11:05:06 +02:00
Christophe Riccio
1de93021bd Updated compiler detection 2013-08-27 10:50:33 +02:00
Christophe Riccio
22ab3bd59d Merge branch '0.9.5' into nohalf 2013-08-27 10:39:34 +02:00
Christophe Riccio
5be36e0ddc Merge branch 'packing' of https://github.com/g-truc/glm into packing 2013-08-27 10:38:39 +02:00
Christophe Riccio
0330485171 Merge branch '0.9.5' into packing 2013-08-27 10:16:55 +02:00
Christophe Riccio
80f6c06c78 Fixed merge 2013-08-27 10:16:33 +02:00