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)
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 @@
1*.o
2*.lo 1*.lo
2*.o
3*.la 3*.la
4.libs 4.libs
5.deps 5.deps
@@ -30,3 +30,14 @@ elementary_testql
30/ltmain.sh 30/ltmain.sh
31/missing 31/missing
32/stamp-h1 32/stamp-h1
33core
34cscope.out
35doc/elementary.dox
36elementary.spec
37m4/libtool.m4
38m4/ltoptions.m4
39m4/ltsugar.m4
40m4/ltversion.m4
41m4/lt~obsolete.m4
42src/lib/Elementary.h
43tags