From: Kern Sibbald <kern@sibbald.com>
Date: Mon, 7 Mar 2011 15:39:43 +0000 (+0100)
Subject: Pull .gitignore from master
X-Git-Tag: Release-7.0.0~991
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=fb1f58af4d70bc9b8cf15915178e14c47e7f0e3d;p=bacula%2Fbacula

Pull .gitignore from master
---

diff --git a/bacula/.gitignore b/bacula/.gitignore
index a089347f95..759386d07f 100644
--- a/bacula/.gitignore
+++ b/bacula/.gitignore
@@ -142,6 +142,10 @@ platforms/redhat/bacula-dir
 platforms/redhat/bacula-fd
 platforms/redhat/bacula-sd
 
+# platforms/rpms
+platforms/rpms/redhat/*.spec
+platforms/rpms/suse/*.spec
+
 # platforms/suse/
 platforms/suse/Makefile
 platforms/suse/bacula
@@ -388,8 +392,6 @@ src/plugins/sd/main
 src/plugins/sd/Makefile
 
 # src/qt-console/
-src/qt-console/tray-monitor/tray-monitor.conf
-src/qt-console/tray-monitor/tray-monitor.pro
 src/qt-console/ui_*.h
 src/qt-console/bat
 src/qt-console/about-func
@@ -469,6 +471,16 @@ src/qt-console/testprogs/putz/ui
 src/qt-console/testprogs/putz/Makefile
 src/qt-console/testprogs/putz/moc
 
+# src/qt-console/tray-monitor
+src/qt-console/tray-monitor/Makefile.mingw32
+src/qt-console/tray-monitor/Makefile.mingw32.Debug
+src/qt-console/tray-monitor/Makefile.mingw32.Release
+src/qt-console/tray-monitor/debug/
+src/qt-console/tray-monitor/moc/
+src/qt-console/tray-monitor/tray-monitor.conf
+src/qt-console/tray-monitor/tray-monitor.pro
+src/qt-console/tray-monitor/ui/
+
 # src/qt-console/ts/
 src/qt-console/ts/bat_fr.qm
 src/qt-console/ts/bat_de.qm