Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-06-22 06:42:13 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-06-22 06:42:13 (GMT) |
| commit | fead5b2c5492a076294aceb0b0cb3e35f5a76b56 (patch) | |
| tree | 7eccbf0740ce9b0f70f981397f560156747c0614 /COPYING | |
| parent | cb20f254b21f770dda4cc9a361ea75d2b7f2d877 (diff) | |
| parent | ffb711c02f9ab6b32c6fd7c21d21f35f4552a5fd (diff) | |
| download | swift-contrib-fead5b2c5492a076294aceb0b0cb3e35f5a76b56.zip swift-contrib-fead5b2c5492a076294aceb0b0cb3e35f5a76b56.tar.bz2 | |
Merge branch 'swift-1.x'
* swift-1.x:
Some more Debian fixes.
Conflicts:
COPYING
Diffstat (limited to 'COPYING')
| -rw-r--r-- | COPYING | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -825,7 +825,11 @@ Swift contains some code contributed under the BSD License, under the following --- START OF BSD LICENSE Copyright (c) 2011, Arnt Gulbrandsen Copyright (c) 2011, Thilo Cestonaro +<<<<<<< HEAD Copyright (c) 2011, Vlad Voicu +======= +Copyright (c) 2011, Jan Kaluza +>>>>>>> swift-1.x All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: |