summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorHadriel Kaplan <hadrielk@yahoo.com>2014-01-29 23:43:31 -0500
committerEvan Huus <eapache@gmail.com>2014-01-30 22:47:51 +0000
commit5c7d57a1e2711029a5ae9c18e1afeef9f4647479 (patch)
treeee1319e92058dd0d1d9f4f03579debe938cc635b /.gitignore
parent21e0a63b295a159b5876018eb03d714a4600a8eb (diff)
downloadwireshark-5c7d57a1e2711029a5ae9c18e1afeef9f4647479.tar.gz
In .gitignore: added dylib and sublimetext file types to be ignored, plus init.lua from anywhere, and removed the dir-specific entries for it.
Change-Id: I4b1f9b1603dcbf1e895944a4ccf382ad6ee309b0 Reviewed-on: https://code.wireshark.org/review/49 Reviewed-by: Evan Huus <eapache@gmail.com> Tested-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore6
1 files changed, 4 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index fe01da46c4..44d5e40408 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@
*scanner.c
*_dict.c
*_lex.h
+init.lua
epan/declare_wslua.h
epan/dissectors/dcerpc/idl2wrs
epan/dissectors/mesa
@@ -23,7 +24,6 @@ epan/dissectors/register-cache.pkl
epan/dissectors/register.c
epan/dtd_parse.c
epan/dtd_preparse.c
-epan/init.lua
epan/packet-ncp2222.c
epan/register-cache.pkl
epan/register.c
@@ -33,7 +33,6 @@ epan/taps.txt
epan/taps_wslua.c
epan/uat_load.c
epan/wslua/declare_wslua.h
-epan/wslua/init.lua
epan/wslua/register_wslua.c
epan/wslua/taps.txt
epan/wslua/taps_wslua.c
@@ -184,3 +183,6 @@ packaging/macosx/Wireshark_package.pmdoc/index.xml
packaging/rpm/SPECS/wireshark.spec
packaging/svr4/checkinstall
packaging/svr4/pkginfo
+*.dylib
+*.sublime-project
+*.sublime-workspace