.gitignore: Merge weather's to the main .gitignore

Weather's .gitignore merged to the main one and more
entries added.

Signed-off-by: Anselmo Lacerda S. de Melo <anselmo.melo@openbossa.org>

2 files changed, 8 insertions, 19 deletions

diff --git a/.gitignore b/.gitignore
index e1eb46c..62f181f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,11 @@ qrc_*.cpp
 *.mk
 *.cache
 *#
+.cproject
+.project
+.make.cache
+ABLD.BAT
+hyperui/hyperui
+mybudget/mybudget
+shoplist/shoplist
+weather/weather
diff --git a/weather/.gitignore b/weather/.gitignore
deleted file mode 100644
index 0e67ed9..0000000
--- a/weather/.gitignore
+++ /dev/null
@@ -1,19 +0,0 @@
-*.o
-moc_*.cpp
-weather
-qrc_*.cpp
-Makefile
-*~
-weather_*.sis*
-weather.loc
-weather.rss
-weather*.mmp
-weather_reg.rss
-weather*.pkg
-bld.inf
-Makefile_*.mk
-.cproject
-.project
-ABLD.BAT
-.make.cache
-weather.pro.user