Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-04-29 21:36:05 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-04-29 21:36:05 (GMT) |
| commit | fa41e2adea4ddbb2eb0d05cbfa0dec7e290d55d5 (patch) | |
| tree | cb23841b9c569acc513c9e0971f775365c48b7ae /BuildTools | |
| parent | 0ad85cdec57d49b697215103cc73463eacc76eb5 (diff) | |
| parent | 27042edc19e393b24e7953c668a7cec820b710d8 (diff) | |
| download | swift-fa41e2adea4ddbb2eb0d05cbfa0dec7e290d55d5.zip swift-fa41e2adea4ddbb2eb0d05cbfa0dec7e290d55d5.tar.bz2 | |
Merge branch 'swift-1.x'
* swift-1.x:
Build Swiften as a DLL in Debian package.
Added versioning to Swiften.
Conflicts:
BuildTools/Copyrighter.py
Diffstat (limited to 'BuildTools')
| -rwxr-xr-x | BuildTools/Copyrighter.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/BuildTools/Copyrighter.py b/BuildTools/Copyrighter.py index 589459d..8916316 100755 --- a/BuildTools/Copyrighter.py +++ b/BuildTools/Copyrighter.py @@ -136,7 +136,7 @@ elif sys.argv[1] == "check-all-copyrights" : for (path, dirs, files) in os.walk(".") : if "3rdParty" in path or ".sconf" in path or "Swift.app" in path : continue - for filename in [os.path.join(path, file) for file in files if (file.endswith(".cpp") or file.endswith(".h")) and not "ui_" in file and not "moc_" in file and not "qrc_" in file and not "BuildVersion.h" in file and not "Swiften.h" in file and not "swiften-config.h" in file and not "linit.cpp" in file ] : + for filename in [os.path.join(path, file) for file in files if (file.endswith(".cpp") or file.endswith(".h")) and not "ui_" in file and not "moc_" in file and not "qrc_" in file and not "BuildVersion.h" in file and not "Swiften.h" in file and not "Version.h" in file and not "swiften-config.h" in file and not "linit.cpp" in file ] : ok &= check_copyright(filename) if not ok : sys.exit(-1) |