From 52c3e95e2b46afaf0143f4f78ffbdc71bbba6947 Mon Sep 17 00:00:00 2001 From: "Anselmo Lacerda S. de Melo" Date: Wed, 18 Nov 2009 12:58:56 -0300 Subject: .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 --- .gitignore | 8 ++++++++ weather/.gitignore | 19 ------------------- 2 files changed, 8 insertions(+), 19 deletions(-) delete mode 100644 weather/.gitignore 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 -- cgit v1.2.3