From: thiery <thiery@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Tue, 22 Feb 2011 08:06:59 +0000 (+0000)
Subject: Remove lines that are already in gitignore files of parent directories
X-Git-Tag: v3.6_beta2~269
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/7c63e24e7b362c02bd14ac2f1a740a04e9244e86

Remove lines that are already in gitignore files of parent directories

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9674 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/.gitignore b/.gitignore
index 13a058cfe3..08ff2c4f5b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,11 +3,8 @@
 *.l[oa]
 *.loT
 *.[oa]
-*~
-*.log
 *_simulator
 *.mk
-*.swp
 *.patch
 
 ################################################
@@ -41,25 +38,11 @@ simgrid-*.tar.gz
 
 ################################################
 ### Cmake files
-CPackConfig.cmake
-CPackSourceConfig.cmake
-CTestTestfile.cmake
 conftestval
-cmake_install.cmake
-CMakeFiles
-install_manifest.txt
 _CPack_Packages/
-CMakeFiles
-CMakeCache.txt
-DartConfiguration.tcl
-Testing/
-Makefile
-bin/
-lib/
 build_dir/
 buildtools/Cmake/test_prog/prog_va_copy.c
 
-
 ################################################
 ### windows borland
 *.bpr
@@ -81,20 +64,6 @@ doc/tmp.realtoc
 doc/using_bib.html
 doc/Doxyfile
 
-################################################
-### Specific of project 
-.cproject
-.project
-.settings/
-.anjuta
-.anjuta_sym_db.db
-simgrid.anjuta
-.externalToolBuilders/
-Debug/
-.emacs.desktop
-tags
-callgrind.out.*
-
 ################################################
 ### Examples and traces
 *.exe