diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-29 13:50:59 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-29 13:52:49 +0100 |
| commit | 76e16b228e0cd76c152f07e249d0e02f800cbd2d (patch) | |
| tree | 5f4d93f12b6af2b1a4926a13d5782e32f9316c8d /qtenginio | |
| parent | 4b256e249bbbc3285ec1e9dd971278ca53a957bb (diff) | |
| parent | 604f330cd22bcb044f43bcd7ce6f4fe0ed2fe057 (diff) | |
Merge branch 'stable' into dev
Conflicts:
qtactiveqt
qtandroidextras
qtbase
qtconnectivity
qtdeclarative
qtdoc
qtgraphicaleffects
qtimageformats
qtlocation
qtmacextras
qtmultimedia
qtqa
qtquick1
qtquickcontrols
qtrepotools
qtscript
qtsensors
qtserialport
qtsvg
qttools
qttranslations
qtwebkit
qtwebkit-examples
qtwinextras
qtx11extras
qtxmlpatterns
Change-Id: I404135b8463e4cdfc6a235f8c2203ea8ddfa3df5
Diffstat (limited to 'qtenginio')
| m--------- | qtenginio | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/qtenginio b/qtenginio new file mode 160000 +Subproject 136ee0aa5dc2276699018bc743e758ea9ffda12 |