Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-03-28 13:36:48 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-03-28 13:36:48 (GMT) |
| commit | dae28dd45e43fc6e6ef2ec4c6c65d5d736ed86f8 (patch) | |
| tree | f01fe3ff891a815b7c7db511ddbabcc67f916445 /Swiften/Parser/PayloadParsers/JingleS5BTransportMethodPayloadParser.h | |
| parent | a7d213975040a1130ac136d61a055c5b6f5d41fa (diff) | |
| parent | a59af6c6daa72dd491189335cf2d255a788eb0f6 (diff) | |
| download | swift-contrib-dae28dd45e43fc6e6ef2ec4c6c65d5d736ed86f8.zip swift-contrib-dae28dd45e43fc6e6ef2ec4c6c65d5d736ed86f8.tar.bz2 | |
Merge commit 'origin/master'
Conflicts:
BuildTools
Diffstat (limited to 'Swiften/Parser/PayloadParsers/JingleS5BTransportMethodPayloadParser.h')
0 files changed, 0 insertions, 0 deletions