From 0d9522c059e14cbf881b69ac237f1d983e208d96 Mon Sep 17 00:00:00 2001
From: Evan Huus <eapache@gmail.com>
Date: Sat, 6 Oct 2012 20:23:37 +0000
Subject: 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
---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

(limited to '.gitignore')

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
-- 
cgit v1.2.1