diff options
| author | Evan Huus <eapache@gmail.com> | 2012-10-06 20:23:37 +0000 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2012-10-06 20:23:37 +0000 |
| commit | 0d9522c059e14cbf881b69ac237f1d983e208d96 (patch) | |
| tree | 86958e4cfcd4ee7160fd5dee6a3439edecaa3286 /.gitignore | |
| parent | dd26e5504973ead87da309df4a85956c8c6f17d7 (diff) | |
| download | wireshark-0d9522c059e14cbf881b69ac237f1d983e208d96.tar.gz | |
Unify the bzr and git ignore files - they're the exact same format,
so do any necessary cross-pollination and then just make one a symlink
to the other.
svn path=/trunk/; revision=45353
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 4ec766a6e3..1b4e95057d 100644 --- a/.gitignore +++ b/.gitignore @@ -111,6 +111,7 @@ wireshark.pod # Qt # ###### qtshark +/ui/qt/__/ /ui/qt/*.qrc.depends /ui/qt/*.pro.user /ui/qt/*.qm @@ -126,6 +127,7 @@ qtshark *.swp *~ .DS_Store +cscope.* packaging/macosx/COPYING.txt packaging/macosx/Info.plist packaging/rpm/SPECS/wireshark.spec |