summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorBrett Nash <nash@nash.id.au>2010-09-07 06:56:16 +0000
committerBrett Nash <nash@nash.id.au>2010-09-07 06:56:16 +0000
commit2395a8e66e915bac897fed03fc369f76c669d916 (patch)
treecae55b807371dfa3a615c8d5491edbc09e0c61f1 /.gitignore
parent007ca3cd87cf4a95909356a92cce94ec1832bc3e (diff)
downloadelementary-2395a8e66e915bac897fed03fc369f76c669d916.tar.gz
Merge branch 'elmdnd'
Conflicts: trunk/TMP/st/elementary/.gitignore SVN revision: 51935
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore13
1 files changed, 12 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index ebe5d675f..dcdce19e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
-*.o
*.lo
+*.o
*.la
.libs
.deps
@@ -30,3 +30,14 @@ elementary_testql
/ltmain.sh
/missing
/stamp-h1
+core
+cscope.out
+doc/elementary.dox
+elementary.spec
+m4/libtool.m4
+m4/ltoptions.m4
+m4/ltsugar.m4
+m4/ltversion.m4
+m4/lt~obsolete.m4
+src/lib/Elementary.h
+tags