aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules2
m---------qtwebsockets0
2 files changed, 1 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules
index a559afa1..32be037a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -177,7 +177,7 @@
path = qtwebsockets
url = ../qtwebsockets.git
branch = dev
- status = ignore
+ status = addon
[submodule "qtwebchannel"]
depends = qtbase
recommends = qtdeclarative qtwebsockets
diff --git a/qtwebsockets b/qtwebsockets
-Subproject ec60f42c579fcfe6a26c1c0ccb2477ca3ee5ea1
+Subproject edcfbf747f56d4fef9da78843e5dca78b889479