diff options
author | Bahkuh <philip_hq@hotmail.com> | 2013-10-21 08:00:27 +0200 |
---|---|---|
committer | Bahkuh <philip_hq@hotmail.com> | 2013-10-22 20:24:48 +0200 |
commit | f581e20233d2f67a1b0afc974900e258113bb230 (patch) | |
tree | 0af2bb69cf1940c3b98b8c8b06b4c50b61981e4b /.gitignore | |
parent | e9d92606d94837ac24e2583cdfd8d313a0fd9338 (diff) |
This squash should work now.
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 27 |
1 files changed, 11 insertions, 16 deletions
@@ -3,31 +3,28 @@ | |||
3 | .DS_Store? | 3 | .DS_Store? |
4 | ._* | 4 | ._* |
5 | .Spotlight-V100 | 5 | .Spotlight-V100 |
6 | .Trashes | 6 | .Trash* |
7 | Icon? | ||
7 | ethumbs.db | 8 | ethumbs.db |
8 | Thumbs.db | 9 | Thumbs.db |
10 | *.tmp | ||
9 | 11 | ||
10 | //nacl build | 12 | # Make |
11 | nacl/build/ | ||
12 | build/ | ||
13 | !build/Makefile.am | ||
14 | sodium | ||
15 | |||
16 | CMakeCache.txt | 13 | CMakeCache.txt |
17 | CMakeFiles | 14 | CMakeFiles |
18 | Makefile | 15 | Makefile |
19 | cmake_install.cmake | 16 | cmake_install.cmake |
20 | install_manifest.txt | 17 | install_manifest.txt |
18 | tags | ||
19 | Makefile.in | ||
21 | 20 | ||
21 | # Testing | ||
22 | testing/data | 22 | testing/data |
23 | *~ | 23 | *~ |
24 | 24 | ||
25 | # Vim | 25 | # Vim |
26 | *.swp | 26 | *.swp |
27 | 27 | ||
28 | # Ctags | ||
29 | tags | ||
30 | |||
31 | # Object files | 28 | # Object files |
32 | *.o | 29 | *.o |
33 | *.lo | 30 | *.lo |
@@ -37,14 +34,13 @@ tags | |||
37 | *.exe | 34 | *.exe |
38 | *.out | 35 | *.out |
39 | *.app | 36 | *.app |
40 | *.swp | ||
41 | *.la | 37 | *.la |
42 | 38 | ||
39 | # Misc (?) | ||
43 | m4/* | 40 | m4/* |
44 | !m4/pkg.m4 | ||
45 | configure | 41 | configure |
46 | configure_aux | 42 | configure_aux |
47 | Makefile.in | 43 | !m4/pkg.m4 |
48 | aclocal.m4 | 44 | aclocal.m4 |
49 | config.h* | 45 | config.h* |
50 | config.log | 46 | config.log |
@@ -53,13 +49,12 @@ stamp-h1 | |||
53 | autom4te.cache | 49 | autom4te.cache |
54 | libtoxcore.pc | 50 | libtoxcore.pc |
55 | libtool | 51 | libtool |
56 | |||
57 | .deps | 52 | .deps |
58 | .libs | 53 | .libs |
59 | .dirstamp | 54 | .dirstamp |
60 | 55 | ||
61 | #netbeans | 56 | # Netbeans |
62 | nbproject | 57 | nbproject |
63 | 58 | ||
64 | #astyle | 59 | # astyle |
65 | *.orig | 60 | *.orig |