summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-06-18 11:42:25 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-06-18 11:42:25 (GMT)
commitc20ecae7c569befc8c970f839ce9e14410c118fb (patch)
treeb3b5bc4afae5c86ad0173cf2b09843e90bf262f2 /Swiften/QA/ProxyProviderTest/SConscript
parent362b2d147e4050e997104c24b2ed2e818adab5ed (diff)
parent94373e3eac30fe3c1ad5565f436fa3aad212a576 (diff)
downloadswift-c20ecae7c569befc8c970f839ce9e14410c118fb.zip
swift-c20ecae7c569befc8c970f839ce9e14410c118fb.tar.bz2
Merge branch 'swift-1.x'
* swift-1.x: Fixed compilation of Slimber/Qt. Fixed flag order in Slimber. MergeFlags->UseFlags in Slimber. Use UseFlags for compiling the unit test.
Diffstat (limited to 'Swiften/QA/ProxyProviderTest/SConscript')
0 files changed, 0 insertions, 0 deletions