From c68da3f788c905b94f04292161eeb6db5a9aec24 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Mon, 7 Mar 2011 16:39:43 +0100 Subject: [PATCH] Pull .gitignore from master --- bacula/.gitignore | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) 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 -- 2.39.5