Merge Conflict resolved.
[framework/uifw/elementary.git] / .gitignore
1 *.lo
2 *.o
3 *.la
4 .libs
5 .deps
6 *.swp
7 *.pc
8 Makefile
9 Makefile.in
10 *.so
11 *.edj
12 *~
13 src/lib/Elementary.h
14 src/lib/Makefile
15 src/lib/Makefile.in
16 elementary_config
17 elementary_quicklaunch
18 elementary_run
19 elementary_test
20 elementary_testql
21 /aclocal.m4
22 /autom4te.cache/
23 /config.guess
24 /config.log
25 /config.status
26 /config.sub
27 /configure
28 /depcomp
29 /elementary.spec
30 /elementary_config.h
31 /elementary_config.h.in
32 /install-sh
33 /libtool
34 /ltmain.sh
35 /missing
36 /stamp-h1
37 core
38 cscope.out
39 doc/elementary.dox
40 elementary.spec
41 m4/libtool.m4
42 m4/ltoptions.m4
43 m4/ltsugar.m4
44 m4/ltversion.m4
45 m4/lt~obsolete.m4
46 tags