summaryrefslogtreecommitdiffstats
path: root/qtsystems
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2013-05-02 15:11:38 +0200
committerOswald Buddenhagen <oswald.buddenhagen@digia.com>2013-05-02 15:16:06 +0200
commitbbb720486fd97899e45ab3c7ffe3ca3bc560f6c7 (patch)
treea7ad0f5aee52e8766d96b61520b74e2de2686432 /qtsystems
parent8e64df07565880795d9b79c38183d4708d6c13d6 (diff)
parent33072afc5874185fdee79aefda03ebe6a82ca401 (diff)
Merge branch 'stable' into dev
the sha1s of existing modules were skipped (the update bot will handle them as usual). all newly appeared modules got their sha1s forward-merged. Conflicts: .gitmodules qt.pro <plenty of submodules> Change-Id: I724998c2011f274c3aea5996a7fdbe303d246551
Diffstat (limited to 'qtsystems')
m---------qtsystems0
1 files changed, 0 insertions, 0 deletions
diff --git a/qtsystems b/qtsystems
new file mode 160000
+Subproject b7b67d1130a2e38ecf52a6c64c9c9cf8356b4ba