From d3fd74246fc44a05267bf37c154d2d1a728723f9 Mon Sep 17 00:00:00 2001
From: Seth Hillbrand <hillbrand@ucdavis.edu>
Date: Thu, 2 May 2019 09:54:31 -0700
Subject: [PATCH] Merge remote-tracking branch 'andrei/pr-gitignore'

(cherry picked from commit 4d776034ca870948955267e8bef53f46824af6c3)

This also picks up an additional line from 45aa514591 that keeps
CMakeModules/*.cmake.  The rest of that commit does not merge cleanly.
---
 .gitignore | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.gitignore b/.gitignore
index 9b4ba75e74..7e3caf91d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,3 +76,12 @@ demos/**/fp-info-cache
 *.gch
 *.orig
 *.patch
+
+# These CMake files are wanted
+!CMakeModules/*.cmake
+
+# Eclipse IDE
+.project
+.cproject
+.pydevproject
+__pycache__