diff options
| author | Jędrzej Nowacki <jedrzej.nowacki@digia.com> | 2014-02-14 12:54:45 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-14 12:54:45 +0100 |
| commit | a1b1904575f92b8a34bd5a957ff485b78258c692 (patch) | |
| tree | 172e381be99c80e187161755c3b3201abc1b5419 | |
| parent | 82d86f972649f821371a58b555be3f96869e7bf9 (diff) | |
| parent | 508f09f29ff43365c06aebb4f9986c66cff779a7 (diff) | |
Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | dist/changes-1.0.2 | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/.qmake.conf b/.qmake.conf index ca0b710..2721546 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) CONFIG += warning_clean CONFIG += qt_example_installs -MODULE_VERSION = 1.0.1 +MODULE_VERSION = 1.0.2 diff --git a/dist/changes-1.0.2 b/dist/changes-1.0.2 new file mode 100644 index 0000000..c7001f5 --- /dev/null +++ b/dist/changes-1.0.2 @@ -0,0 +1,4 @@ +Main changes +------------ +- Static build was fixed +- Different documentation and examples improvements |