Commit graph

435 commits

Author SHA1 Message Date
Roman Telezhynskyi 5aaeaaf9da SonarQube warnings.
--HG--
branch : develop
2017-05-12 10:15:44 +03:00
Roman Telezhynskyi 34f3737c9e Begin new branch v0.6.0.
--HG--
branch : develop
2017-05-12 08:47:05 +03:00
Roman Telezhynskyi b355f1dbfc Prepare to release 0.5.0. Change version number.
--HG--
branch : release
2017-05-09 16:04:31 +03:00
Roman Telezhynskyi 7840bf04eb Resolved issue #668. Passmarks on Hems.
--HG--
branch : release
2017-04-25 11:42:08 +03:00
Roman Telezhynskyi 73c035ecc9 Fix bug with trigonometric functions.
Functions sin(), cos() and tan() take radians. And their counterparts asin(),
acos() and atan() return radians. Removed hyperbolic functions because they do
not work with radians.

--HG--
branch : release
2017-04-14 18:42:49 +03:00
Roman Telezhynskyi a7b721941a Fix build on Windows.
--HG--
branch : release
2017-04-14 17:47:39 +03:00
Roman Telezhynskyi cade111206 Refactoring Tape's preferences dialog.
Instead of manual declaring used Qt Designer.

--HG--
branch : release
2017-04-12 15:50:48 +03:00
Roman Telezhynskyi a1caf972a9 Warn a user when need to update a file format version.
--HG--
branch : release
2017-04-12 09:49:05 +03:00
Roman Telezhynskyi 2915402526 Removed Community page from Preferences.
--HG--
branch : release
2017-04-11 12:21:15 +03:00
Roman Telezhynskyi c264b80ea0 Refactoring. Hide private static members.
--HG--
branch : release
2017-04-11 11:16:11 +03:00
Roman Telezhynskyi a3056dc7e2 Qt 5.2.0 is now minimal requirement to build the code.
--HG--
branch : release
2017-04-10 22:18:36 +03:00
Roman Telezhynskyi 3f1b042d6c Get hash also from git repository.
Because we use both hg and git (as mirror) we can get hash of current commit
from git too.

--HG--
branch : release
2017-04-10 20:24:58 +03:00
Roman Telezhynskyi 948eef41e6 We in beta from now.
--HG--
branch : release
2017-04-10 19:21:45 +03:00
Roman Telezhynskyi d355b4dce8 Cppcheck warnings.
--HG--
branch : develop
2017-04-06 15:50:15 +03:00
Roman Telezhynskyi c0f36dffbe Resolved issue #652. Show passmarks for builtin seam allowance.
--HG--
branch : develop
2017-04-05 13:22:33 +03:00
Roman Telezhynskyi b9f886d28d Fix building on Mac.
--HG--
branch : develop
2017-04-01 19:53:28 +03:00
Roman Telezhynskyi 38bb9c86b9 Fix building on Mac.
--HG--
branch : develop
2017-04-01 19:23:20 +03:00
Roman Telezhynskyi e2383eb500 Refactoring. Use "=default" instead of the default implementation.
--HG--
branch : develop
2017-04-01 17:27:55 +03:00
Roman Telezhynskyi 016e2db2e6 Refactoring. Remove unused local variables.
--HG--
branch : develop
2017-04-01 10:28:13 +03:00
Roman Telezhynskyi 1d82d96562 Refactoring. Move "inline" specifier to the definition of the function.
--HG--
branch : develop
2017-04-01 10:23:44 +03:00
Roman Telezhynskyi f9aa896477 Refactoring. Avoid implicit conversions.
--HG--
branch : develop
2017-03-31 17:04:11 +03:00
Roman Telezhynskyi 6ac1a1247c Read/write passmark information.
--HG--
branch : feature
2017-03-24 14:48:07 +02:00
Roman Telezhynskyi 81b88db5cc Dialog Seam allowance tool now supports passmarks.
--HG--
branch : feature
2017-03-24 13:08:16 +02:00
Roman Telezhynskyi 96255ef093 Dialog Insert node tool.
--HG--
branch : feature
2017-03-21 15:39:14 +02:00
Roman Telezhynskyi dccdef56eb Fix incorrect sRGB profiles.
--HG--
branch : develop
2017-03-21 13:12:45 +02:00
Roman Telezhynskyi 6a3eff4c0b Resolved issue #641. Seam Allowance Tools tab texts truncated in MAC.
--HG--
branch : feature
2017-03-17 16:38:18 +02:00
Murloc 506ca0612c Add 200 in heights
--HG--
branch : feature
2017-03-09 21:41:48 +01:00
Roman Telezhynskyi 8a6ed9e426 Fixed typo.
--HG--
branch : develop
2017-03-09 15:52:41 +02:00
Roman Telezhynskyi 778cbb2a70 Cppcheck warnings.
--HG--
branch : develop
2017-03-09 12:23:36 +02:00
Roman Telezhynskyi d47505b076 Merge with develop.
--HG--
branch : feature
2017-02-28 17:34:11 +02:00
Georg von Zengen 159432927a qmuparser: added triangular functions that work with degree
new functions are: degTorad, radTodeg, , sinD, cosD, tanD, asinD, acosD , atanD, sinhD, coshD , tanhD, asinhD, acoshD, atanhD

--HG--
branch : feature
2017-02-27 20:42:35 +01:00
Roman Telezhynskyi e7651c7194 Merge with develop.
--HG--
branch : feature
2017-02-23 09:29:28 +02:00
Roman Telezhynskyi 67d69781f3 Remove the code after "return".
--HG--
branch : develop
2017-02-22 19:27:53 +02:00
Roman Telezhynskyi 3bf65edaa6 Merge with develop.
--HG--
branch : feature
2017-02-22 14:48:48 +02:00
Roman Telezhynskyi b31a8d4c6b Extend max size to 72 cm.
Request from a user. See
http://forum.valentina-project.org/t/extension-of-standard-measurements/957

--HG--
branch : develop
2017-02-22 07:54:42 +02:00
Roman Telezhynskyi 38abf5c9a0 Removed redundant forward declaration.
--HG--
branch : develop
2017-02-18 11:22:59 +02:00
Roman Telezhynskyi ce4a217c57 Merge with develop.
--HG--
branch : feature
2017-02-17 21:01:11 +02:00
Roman Telezhynskyi d038a22aa3 Fix broken build.
--HG--
branch : develop
2017-02-17 20:54:16 +02:00
Roman Telezhynskyi 5a0d9b0e00 Merge with develop.
--HG--
branch : feature
2017-02-17 20:38:45 +02:00
Roman Telezhynskyi 2f024db547 Resolved issue #611. Improve feature: Paths preferences.
--HG--
branch : develop
2017-02-17 20:37:49 +02:00
Roman Telezhynskyi a3d27bf9db Refacoring. Use marcos for getting current combobox data.
--HG--
branch : feature
2017-02-15 15:23:04 +02:00
Roman Telezhynskyi 6597f68dad Show all pins when tab Pins is active.
--HG--
branch : feature
2017-02-14 17:33:30 +02:00
Roman Telezhynskyi 71ac49a221 Merge with develop.
--HG--
branch : feature
2017-02-13 15:29:37 +02:00
Roman Telezhynskyi 9c27e7bfed Fixed issue #624. Icon resulotion issues with some display setups.
--HG--
branch : develop
2017-02-09 15:43:17 +02:00
Roman Telezhynskyi 7d78a0f63f Resolved issue #619. Non writable directory prevents opening.
--HG--
branch : develop
2017-02-04 13:28:47 +02:00
Roman Telezhynskyi b9d635dab2 Dialog Pin tool.
--HG--
branch : feature
2017-01-31 14:28:48 +02:00
Roman Telezhynskyi d08282218b Optimized png files.
--HG--
branch : develop
2017-01-28 16:58:07 +02:00
Roman Telezhynskyi b26eca13eb Optimized png files.
--HG--
branch : feature
2017-01-28 16:58:07 +02:00
Roman Telezhynskyi d7d9deb536 Fix test.
--HG--
branch : feature
2017-01-25 13:51:44 +02:00
Roman Telezhynskyi 3d835be3b7 Fix test warning message.
--HG--
branch : feature
2017-01-23 14:02:34 +02:00
Roman Telezhynskyi 669d295804 Class VToolDetail removed.
--HG--
branch : feature
2017-01-21 16:30:14 +02:00
Roman Telezhynskyi 5a95ce9c8a Merge with develop.
--HG--
branch : feature
2017-01-11 14:05:06 +02:00
Roman Telezhynskyi 5aa863cf3b Modified output to see point coordinates.
--HG--
branch : develop
2017-01-10 20:45:15 +02:00
Roman Telezhynskyi b4c4a22a4c Merge with develop.
--HG--
branch : feature
2017-01-03 11:48:22 +02:00
Roman Telezhynskyi 86f4b21879 Instead of method QLocale::system() better to use the default constructor.
Usefull in case we will deside change default locale.

--HG--
branch : develop
2017-01-03 10:46:28 +02:00
Roman Telezhynskyi 0419f60e0b Merge with develop.
--HG--
branch : feature
2016-12-23 12:58:17 +02:00
Roman Telezhynskyi 731eb9ec89 Refactoring.
There is no automatic disconnection when the 'receiver' is destroyed because
it's a functor with no QObject. However, since 5.2 there is an overload which
adds a "context object". When that object is destroyed, the connection is
broken (the context is also used for the thread affinity: the lambda will be
called in the thread of the event loop of the object used as context).

--HG--
branch : develop
2016-12-21 20:45:14 +02:00
Roman Telezhynskyi 6fe96ca4d0 Remove empty statement.
--HG--
branch : develop
2016-12-21 18:12:49 +02:00
Roman Telezhynskyi 5c40a91335 Remove empty statement.
--HG--
branch : develop
2016-12-21 17:36:38 +02:00
Roman Telezhynskyi bba88c108f Fix possible use of uninitialized value.
--HG--
branch : develop
2016-12-21 12:32:38 +02:00
Roman Telezhynskyi 2d61b87256 Remove empty statement.
--HG--
branch : develop
2016-12-20 21:19:21 +02:00
Roman Telezhynskyi ffab000e0f Remove empty statement.
--HG--
branch : develop
2016-12-20 20:57:20 +02:00
Roman Telezhynskyi 0882313f1e Merge with develop.
--HG--
branch : feature
2016-12-20 17:42:51 +02:00
Roman Telezhynskyi 1fb0ab4d75 Added VNodeEllipticalArc.
--HG--
branch : develop
2016-12-20 16:51:58 +02:00
Roman Telezhynskyi 81eb33fe63 Merge with develop.
--HG--
branch : feature
2016-12-20 14:39:05 +02:00
Valentina Zhuravska aa24976f9a Added elliptical arc tool to MainWindow.
--HG--
branch : feature
2016-12-17 03:17:29 +02:00
Valentina Zhuravska 00ab0a225e Added VToolEllipticalArc.
--HG--
branch : feature
2016-12-17 03:01:40 +02:00
Roman Telezhynskyi 64c2026e6a Merge with develop.
--HG--
branch : feature
2016-12-03 12:43:19 +02:00
Roman Telezhynskyi df758fd159 Redesign AbstractTest::Run.
--HG--
branch : develop
2016-12-03 10:20:45 +02:00
Roman Telezhynskyi e2579c231c Fix pointer to current scene. Show piece path visualization if the tool dialog
was opened.

--HG--
branch : feature
2016-11-29 19:39:40 +02:00
Roman Telezhynskyi 3ab96f0105 Better to manually define values for enum in this case. Values used in file.
--HG--
branch : feature
2016-11-29 15:29:29 +02:00
Roman Telezhynskyi 5156e0cf25 Read/write piece path include type.
--HG--
branch : feature
2016-11-28 14:52:31 +02:00
Roman Telezhynskyi fea2ec52fe New section "Custom seam allowance".
--HG--
branch : feature
2016-11-28 10:47:36 +02:00
Roman Telezhynskyi 6424a92559 Read/write custom seam allowance record.
--HG--
branch : feature
2016-11-25 14:19:44 +02:00
Roman Telezhynskyi 7f1bab1ac6 Fix typo.
--HG--
branch : feature
2016-11-24 21:31:27 +02:00
Roman Telezhynskyi 6793bb69f1 Some updates for dialog.
--HG--
branch : feature
2016-11-23 14:50:30 +02:00
Roman Telezhynskyi 6b89f43e87 Tool button connected to tool dialog.
--HG--
branch : feature
2016-11-22 14:33:08 +02:00
Roman Telezhynskyi c21aedc541 A seam allowance node angle. Read, write and set in the dialog. Not handled in
seam allowance itself.

--HG--
branch : feature
2016-11-19 13:44:12 +02:00
Roman Telezhynskyi 3d835a1a2a Merge with develop
--HG--
branch : feature
2016-11-14 20:35:22 +02:00
Roman Telezhynskyi 0cd7a023a2 Trying to understand why tests failing on bitbucket pipelines.
--HG--
branch : develop
2016-11-14 20:34:26 +02:00
Roman Telezhynskyi 731456f714 Merge with develop
--HG--
branch : feature
2016-11-08 12:57:19 +02:00
Roman Telezhynskyi 4a41840ae7 New class VToolSeamAllowance.
--HG--
branch : feature
2016-11-08 12:57:01 +02:00
Roman Telezhynskyi 32c7db68e0 Resolved issue #504. Suppress message about absolute measurement path.
I decided to completely eliminate warning strings because they do not change
anything.

--HG--
branch : develop
2016-11-07 15:04:00 +02:00
Roman Telezhynskyi 940a1e404b Merge with develop
--HG--
branch : feature
2016-11-05 15:31:40 +02:00
Roman Telezhynskyi 65a38141de Added class VisToolPiece.
Show visualization creating piece main path.

--HG--
branch : feature
2016-11-05 10:56:44 +02:00
Roman Telezhynskyi 68ef544ac4 Collection test. Make timeout 2 minutes.
--HG--
branch : develop
2016-11-04 19:42:23 +02:00
Roman Telezhynskyi 4c3f65b0ab Refactoring AbstractTest::Run.
To be able to see more appropriate warnings we should compare only exit codes.

--HG--
branch : develop
2016-11-04 15:15:11 +02:00
Roman Telezhynskyi 1bc0378b69 Enable attribute Qt::AA_UseHighDpiPixmaps only since Qt 5.6.0. ref #584.
--HG--
branch : develop
2016-11-04 12:44:57 +02:00
Roman Telezhynskyi 2c7bb5d5fc Clang warnings.
--HG--
branch : develop
2016-11-01 11:46:51 +02:00
Roman Telezhynskyi d134e8b367 Clang warnings.
--HG--
branch : develop
2016-11-01 10:42:32 +02:00
Roman Telezhynskyi d8114a18f1 Cppcheck warning.
--HG--
branch : develop
2016-10-30 16:25:14 +02:00
Roman Telezhynskyi 3e8f8a8069 Resolved issue #582. Issue with standard path to shared data on Linux.
--HG--
branch : develop
2016-10-30 14:34:55 +02:00
Roman Telezhynskyi b644209406 Resolved issue #580. Extend the list of heights.
--HG--
branch : develop
2016-10-26 14:49:09 +03:00
Roman Telezhynskyi be10c88b7e Added new language Greek (Greece).
--HG--
branch : develop
2016-10-25 21:29:54 +03:00
Roman Telezhynskyi 214c4a50b6 Fixed path to translations and standard measurements on Mac OS X.
--HG--
branch : develop
2016-10-25 17:54:51 +03:00
Roman Telezhynskyi 5c821e331d Refactoring function MapDiagrams(). ref #576.
--HG--
branch : develop
2016-10-17 16:55:58 +03:00
Roman Telezhynskyi 9da0b5cab5 Refactoring methods GetMinPrinterFields and GetPrinterFields.
--HG--
branch : develop
2016-10-06 19:13:06 +03:00
Roman Telezhynskyi abce5439a5 Resolved issue #573. New tool: 'Move Point'.
--HG--
branch : develop
2016-10-04 17:34:37 +03:00
Roman Telezhynskyi 723d68b245 Resolved issue #570. Error: Tiled PDF : field values not taken into account if
one of them is smaller than 0,3.

--HG--
branch : develop
2016-09-30 19:33:10 +03:00
Roman Telezhynskyi 3bb657ea1a New internal variable "Length to spline control point".
--HG--
branch : develop
2016-09-24 20:44:06 +03:00
Roman Telezhynskyi efef5d371b Suppress also fatal errors from qt.network.ssl. ref #568.
--HG--
branch : develop
2016-09-20 17:28:39 +03:00
Roman Telezhynskyi f370629af0 Fixed support Qt 5.0.
--HG--
branch : develop
2016-09-20 14:27:21 +03:00
Roman Telezhynskyi b28ac8e97b Fixed issue #568. Certificate checking on Mac OS X.
--HG--
branch : develop
2016-09-20 14:10:42 +03:00
Roman Telezhynskyi 74bc4179ef New tool Flipping by axis.
--HG--
branch : feature
2016-09-17 12:10:03 +03:00
Roman Telezhynskyi 9bb88afaa5 New tool Flipping by line.
--HG--
branch : feature
2016-09-13 11:27:44 +03:00
Roman Telezhynskyi a9e9c0d5ad Clear a list of recent files from non-existent files.
--HG--
branch : develop
2016-09-09 14:01:57 +03:00
Roman Telezhynskyi c622d173dd Several useful constans.
--HG--
branch : develop
2016-09-06 17:48:28 +03:00
Roman Telezhynskyi 0d35033275 Added global option "Forbid Flipping". ref #560.
--HG--
branch : develop
2016-09-06 17:05:54 +03:00
Roman Telezhynskyi 6baa623be3 Disable buttons Find Next and Find Previous if the search field is empty.
--HG--
branch : develop
2016-08-26 16:16:06 +03:00
Roman Telezhynskyi 23d9898154 Use QLocale::c() instead of QLocale(QLocale::C).
--HG--
branch : develop
2016-08-26 12:38:23 +03:00
Roman Telezhynskyi 99a2f0f807 Fixed issue #553. Tape.exe crash. Issue with the Search field.
(grafted from c4cc1aca74cb29d3fb57cd0718ec282b3dd0dc7b)

--HG--
branch : develop
2016-08-25 19:32:59 +03:00
Roman Telezhynskyi be6c676145 We don't need these files anymore.
--HG--
branch : develop
2016-08-23 15:54:44 +03:00
Roman Telezhynskyi 6281f46a8e Rewrite describing placeholders %size% and %height%. New way will help avoid
translation mistake.

--HG--
branch : develop
2016-08-23 14:02:09 +03:00
Roman Telezhynskyi e54e1e4f11 Allow to select printer in Layout Settings dialog.
--HG--
branch : develop
2016-08-22 19:43:22 +03:00
Roman Telezhynskyi 7dd88da82d Merged in BojanKverh/valentina-issue24a/feature (pull request #138)
Improvements for feature "New feature: Label on detail" ref #24.

--HG--
branch : develop
2016-08-22 11:33:22 +03:00
Roman Telezhynskyi bfff8ccb96 Changes for returning support Qt 5.0 and GCC 4.6.
--HG--
branch : develop
2016-08-21 18:57:08 +03:00
Roman Telezhynskyi b0a7af152a <QDebugStateSaver> was introduced since Qt 5.1.
--HG--
branch : develop
2016-08-21 13:19:42 +03:00
Roman Telezhynskyi 3f4f605253 Qt::AA_UseHighDpiPixmaps was introduced since Qt 5.1.
--HG--
branch : develop
2016-08-21 13:11:14 +03:00
Bojan Kverh 08bfd9cd82 Merged develop into feature
--HG--
branch : feature
2016-08-21 11:51:49 +02:00
Roman Telezhynskyi 0563df117d <QLoggingCategory> available since Qt 5.2. Use vmisc/logging.h instead.
--HG--
branch : develop
2016-08-21 11:54:32 +03:00
Roman Telezhynskyi 3fea569989 #include <QtMath> was introduced since Qt 5.1.
--HG--
branch : develop
2016-08-21 11:09:49 +03:00
Roman Telezhynskyi 3da7c4f27f Backporting qmath.h. Leave only part that was missed in Qt 5.0.
--HG--
branch : develop
2016-08-21 11:04:03 +03:00
Bojan Kverh 10f2d83edd Merged develop into feature
--HG--
branch : feature
2016-08-17 18:00:56 +02:00
Roman Telezhynskyi e333c9bc08 QtDebug and QDebug lead to the same header. Leave only QtDebug.
--HG--
branch : develop
2016-08-16 20:35:21 +03:00
Roman Telezhynskyi d66280033b Fixed issue #546. Compile error under Windows in current develop revision.
--HG--
branch : develop
2016-08-16 19:57:32 +03:00
BojanKverh 86f24bf0e5 User defined materials are now remembered and can also be deleted in preferences dialog
--HG--
branch : feature
2016-08-12 01:22:23 +02:00
Roman Telezhynskyi 7585db6a58 Fix build on Qt\5.3\msvc2013_64_opengl.
--HG--
branch : develop
2016-08-09 16:55:46 +03:00
Roman Telezhynskyi 9035382238 Cppcheck warnings.
--HG--
branch : develop
2016-08-09 14:18:49 +03:00
Roman Telezhynskyi eec896edd0 Fix errors. error: QPrinter: No such file or directory.
error: QMetaTypeId: No such file or directory.

--HG--
branch : develop
2016-08-08 15:26:48 +03:00
Roman Telezhynskyi 80f00b361d Use "Include What You Use" tool for optimizing #includes.
--HG--
branch : develop
2016-08-08 14:44:49 +03:00
Roman Telezhynskyi 8118bd45e5 With GCC 6.1.1:
debugbreak.h:51:1: error: 'inline' is not at beginning of
declaration [-Werror=old-style-declaration]

So i moved the inlines at the beginning of the declaration.

--HG--
branch : develop
2016-08-07 14:25:43 +03:00
Roman Telezhynskyi c9cdd2cd8d Using macros QT_WARNING_DISABLE_*.
--HG--
branch : develop
2016-08-06 21:42:40 +03:00
Roman Telezhynskyi 88be00fe42 Fixed build on Qt lower version 5.5.0.
--HG--
branch : develop
2016-08-06 19:32:51 +03:00
Roman Telezhynskyi 1c987b919b Use gcc’s Address Sanitizer only in Debug mode.
--HG--
branch : develop
2016-08-06 19:23:42 +03:00
Roman Telezhynskyi 69e0ff74e6 MSVC warnings.
--HG--
branch : develop
2016-08-06 15:59:30 +03:00
Roman Telezhynskyi 483e56866d Added MSVC warnings.
--HG--
branch : develop
2016-07-29 21:04:53 +03:00
Roman Telezhynskyi 75e9e9b2ee Fixed issues with include paths.
--HG--
branch : develop
2016-08-05 13:41:02 +03:00
Roman Telezhynskyi 8f78b31710 Translation unit tests moved to separate binary.
--HG--
branch : develop
2016-08-04 19:28:28 +03:00
Roman Telezhynskyi ce92d2994d Show debug string immediately after call.
--HG--
branch : develop
2016-08-03 14:53:38 +03:00
Roman Telezhynskyi ffb6f1fbd5 cppcheck warnings.
--HG--
branch : develop
2016-08-02 15:12:13 +03:00
Roman Telezhynskyi 3e12775a22 qt.network.ssl.warning=false appears only since Qt 5.4.1.
--HG--
branch : develop
2016-08-02 13:46:46 +03:00
Roman Telezhynskyi 47b1e20257 Fixed issue #538. QSslSocket error messages during startup in newest development
build.

--HG--
branch : develop
2016-08-02 13:43:41 +03:00
Bojan Kverh 4138d30fb6 Merged develop into feature
--HG--
branch : feature
2016-07-21 08:30:51 +02:00
Roman Telezhynskyi 9375e0319d As part of testing make all compiler warnings treat as errors.
Added new CONFIG option "checkWarnings".

--HG--
branch : develop
2016-07-20 15:40:33 +03:00
Roman Telezhynskyi 19387cc80e Resolved issue #528. Error: QSslSocket: cannot resolve SSLv2_client_method.
--HG--
branch : develop
2016-07-20 11:48:09 +03:00
Roman Telezhynskyi 1bffa92127 Using QLatin1String instead of QLatin1Literal.
QLatin1Literal is just a typedef of QLatin1String lefter for compatibility with
Qt 4.x.

--HG--
branch : develop
2016-07-20 11:39:15 +03:00
Roman Telezhynskyi 817a5d5f56 Fixed suppression warnings in Release mode.
Used wrong macros.

--HG--
branch : develop
2016-07-20 11:10:23 +03:00
BojanKverh 9943fa7c8b Merging
--HG--
branch : feature
2016-07-18 20:56:05 +02:00
Roman Telezhynskyi 47f12c80f8 Refactoring. Use lambda for small slots. Move slots declaration in appropriate
place.

--HG--
branch : develop
2016-07-18 18:09:15 +03:00
Bojan Kverh 37425be026 Merged develop into feature
--HG--
branch : feature
2016-07-15 23:06:50 +02:00