summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorBahkuh <philip_hq@hotmail.com>2013-10-21 08:00:27 +0200
committerBahkuh <philip_hq@hotmail.com>2013-10-22 20:24:48 +0200
commitf581e20233d2f67a1b0afc974900e258113bb230 (patch)
tree0af2bb69cf1940c3b98b8c8b06b4c50b61981e4b /.gitignore
parente9d92606d94837ac24e2583cdfd8d313a0fd9338 (diff)
This squash should work now.
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore27
1 files changed, 11 insertions, 16 deletions
diff --git a/.gitignore b/.gitignore
index aa7d8f50..e903e3ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,31 +3,28 @@
3.DS_Store? 3.DS_Store?
4._* 4._*
5.Spotlight-V100 5.Spotlight-V100
6.Trashes 6.Trash*
7Icon?
7ethumbs.db 8ethumbs.db
8Thumbs.db 9Thumbs.db
10*.tmp
9 11
10//nacl build 12# Make
11nacl/build/
12build/
13!build/Makefile.am
14sodium
15
16CMakeCache.txt 13CMakeCache.txt
17CMakeFiles 14CMakeFiles
18Makefile 15Makefile
19cmake_install.cmake 16cmake_install.cmake
20install_manifest.txt 17install_manifest.txt
18tags
19Makefile.in
21 20
21# Testing
22testing/data 22testing/data
23*~ 23*~
24 24
25# Vim 25# Vim
26*.swp 26*.swp
27 27
28# Ctags
29tags
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 (?)
43m4/* 40m4/*
44!m4/pkg.m4
45configure 41configure
46configure_aux 42configure_aux
47Makefile.in 43!m4/pkg.m4
48aclocal.m4 44aclocal.m4
49config.h* 45config.h*
50config.log 46config.log
@@ -53,13 +49,12 @@ stamp-h1
53autom4te.cache 49autom4te.cache
54libtoxcore.pc 50libtoxcore.pc
55libtool 51libtool
56
57.deps 52.deps
58.libs 53.libs
59.dirstamp 54.dirstamp
60 55
61#netbeans 56# Netbeans
62nbproject 57nbproject
63 58
64#astyle 59# astyle
65*.orig 60*.orig