summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2012-12-09 16:21:40 (GMT)
committerRemko Tronçon <git@el-tramo.be>2012-12-22 14:25:39 (GMT)
commitd6bb5d79e3726d2aad82b52fe637030177b4950f (patch)
treeb2f4c74a1592825582f82d88d74ae3b85b42665b /Swiften/Examples/ConnectivityTest
parent2b7f55a30b07f08d32bccd3ea0a72ffd8c820c20 (diff)
downloadswift-contrib-d6bb5d79e3726d2aad82b52fe637030177b4950f.zip
swift-contrib-d6bb5d79e3726d2aad82b52fe637030177b4950f.tar.bz2
Replace MergeFlags calls by UseFlags calls.
Change-Id: If7193006987fd86d102e5e17aac426ef1a6ccd83
Diffstat (limited to 'Swiften/Examples/ConnectivityTest')
-rw-r--r--Swiften/Examples/ConnectivityTest/SConscript4
1 files changed, 2 insertions, 2 deletions
diff --git a/Swiften/Examples/ConnectivityTest/SConscript b/Swiften/Examples/ConnectivityTest/SConscript
index 7bc3892..55a0821 100644
--- a/Swiften/Examples/ConnectivityTest/SConscript
+++ b/Swiften/Examples/ConnectivityTest/SConscript
@@ -1,7 +1,7 @@
Import("env")
myenv = env.Clone()
-myenv.MergeFlags(myenv["SWIFTEN_FLAGS"])
-myenv.MergeFlags(myenv["SWIFTEN_DEP_FLAGS"])
+myenv.UseFlags(myenv["SWIFTEN_FLAGS"])
+myenv.UseFlags(myenv["SWIFTEN_DEP_FLAGS"])
tester = myenv.Program("ConnectivityTest", ["ConnectivityTest.cpp"])