Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-06-18 11:42:25 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-06-18 11:42:25 (GMT) |
| commit | c20ecae7c569befc8c970f839ce9e14410c118fb (patch) | |
| tree | b3b5bc4afae5c86ad0173cf2b09843e90bf262f2 /Swiften/QA/NetworkTest/.gitignore | |
| parent | 362b2d147e4050e997104c24b2ed2e818adab5ed (diff) | |
| parent | 94373e3eac30fe3c1ad5565f436fa3aad212a576 (diff) | |
| download | swift-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/NetworkTest/.gitignore')
0 files changed, 0 insertions, 0 deletions