summaryrefslogtreecommitdiffstats
path: root/QA
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-06-18 10:34:41 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-06-18 10:41:11 (GMT)
commit362b2d147e4050e997104c24b2ed2e818adab5ed (patch)
tree63340cf49072e2cc0d9d876859249eb22fd540d3 /QA
parent0328d98d29b383ecfcb5ffb66df0a9b7b4d85654 (diff)
parent7af8a078c57d94ff63eb81f26de2f55eca6b5c00 (diff)
downloadswift-362b2d147e4050e997104c24b2ed2e818adab5ed.zip
swift-362b2d147e4050e997104c24b2ed2e818adab5ed.tar.bz2
Merge branch 'swift-1.x'
* swift-1.x: Moving unused server code out of Swiften into Limber. Conflicts: Limber/Server/ServerFromClientSession.cpp Limber/Server/ServerSession.cpp Limber/Server/ServerStanzaRouter.cpp Limber/Server/SimpleUserRegistry.cpp Limber/Server/SimpleUserRegistry.h Limber/Server/UnitTest/ServerStanzaRouterTest.cpp Limber/Server/UserRegistry.cpp Limber/main.cpp Slimber/Server.cpp Slimber/Server.h
Diffstat (limited to 'QA')
-rw-r--r--QA/UnitTest/SConscript1
1 files changed, 1 insertions, 0 deletions
diff --git a/QA/UnitTest/SConscript b/QA/UnitTest/SConscript
index e5923ce..a6c7dc8 100644
--- a/QA/UnitTest/SConscript
+++ b/QA/UnitTest/SConscript
@@ -12,6 +12,7 @@ if env["TEST"] :
myenv.MergeFlags(env.get("SLIMBER_FLAGS",""))
myenv.MergeFlags(env.get("SWIFT_CONTROLLERS_FLAGS",""))
myenv.MergeFlags(env.get("SWIFTOOLS_FLAGS",""))
+ myenv.MergeFlags(env.get("LIMBER_FLAGS",""))
myenv.MergeFlags(env.get("SWIFTEN_FLAGS",""))
myenv.MergeFlags(env.get("CPPUNIT_FLAGS",""))
myenv.MergeFlags(env.get("LIBIDN_FLAGS", ""))