summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-04-29 21:36:05 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-04-29 21:36:05 (GMT)
commitfa41e2adea4ddbb2eb0d05cbfa0dec7e290d55d5 (patch)
treecb23841b9c569acc513c9e0971f775365c48b7ae /Swiften/.gitignore
parent0ad85cdec57d49b697215103cc73463eacc76eb5 (diff)
parent27042edc19e393b24e7953c668a7cec820b710d8 (diff)
downloadswift-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 'Swiften/.gitignore')
-rw-r--r--Swiften/.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/Swiften/.gitignore b/Swiften/.gitignore
index c21d6aa..de234f5 100644
--- a/Swiften/.gitignore
+++ b/Swiften/.gitignore
@@ -1,3 +1,4 @@
*.a
*.o
Swiften.h
+Version.h