aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorThomas Willingham <founder@kakste.com>2013-10-01 22:58:44 +0100
committerThomas Willingham <founder@kakste.com>2013-10-01 22:58:44 +0100
commit70fd797994e4b861d20d99cec2a7d801e478d894 (patch)
tree5b00b61522f2c7136912396df54bd3251e3f17c8 /.gitignore
parent2c9c206808fec2212141f8630ce534ed29a47037 (diff)
parent27e97571d44f9e69a66eead9da2de4209996457d (diff)
downloadvolse-hubzilla-70fd797994e4b861d20d99cec2a7d801e478d894.tar.gz
volse-hubzilla-70fd797994e4b861d20d99cec2a7d801e478d894.tar.bz2
volse-hubzilla-70fd797994e4b861d20d99cec2a7d801e478d894.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to '.gitignore')
-rwxr-xr-x.gitignore5
1 files changed, 4 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index b32389dc2..693fb7b24 100755
--- a/.gitignore
+++ b/.gitignore
@@ -32,4 +32,7 @@ report/
.DS_Store
#netbeans project folder
-nbproject
+nbproject
+
+#Kdevelop project files
+*.kdev4