From 0d56a3df41bd3b8b7311467ad6f887aa73e10de3 Mon Sep 17 00:00:00 2001
From: Wenzel Jakob <wenzel@inf.ethz.ch>
Date: Mon, 28 Jul 2014 13:58:46 +0200
Subject: [PATCH] ported hgignore to a gitignore file, a few updates to both

---
 .gitignore | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 .hgignore  |  5 +----
 2 files changed, 50 insertions(+), 4 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..d214aa59
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,49 @@
+# Documentation
+doc/apidocs/*
+doc/*.aux
+doc/*.log
+doc/*.out
+doc/*.toc
+doc/*.bbl
+doc/*.blg
+doc/main.pdf
+doc/plugins_generated.tex
+
+# Build-related
+.sconf_temp
+build/release
+build/debug
+debian
+.sconsign.dblite
+config.py
+config.log
+*.pyc
+
+# MSVC++-related
+build/mitsuba-msvc2010.sdf
+build/mitsuba-msvc2010.suo
+build/mitsuba-msvc2010.vcxproj.user
+data/windows/mitsuba_res.res
+dist
+
+# Debugging history files
+\.gdb_history
+
+# Dependencies
+dependencies
+
+# OSX binaries and byproducts
+Mitsuba.app
+.DS_Store
+
+# Imported geometry and some default output types
+meshes
+textures
+mitsuba.*.log
+*.exr
+
+# Eclipse CDT project files
+.externalToolBuilders
+.settings
+.cproject
+.project
diff --git a/.hgignore b/.hgignore
index d6455dc5..910fa88b 100644
--- a/.hgignore
+++ b/.hgignore
@@ -14,7 +14,6 @@
 ^build/release/.*$
 ^build/debug/.*$
 ^debian/.*$
-^plugins/.*$
 ^.sconsign.dblite$
 ^config.py$
 ^config.log$
@@ -24,9 +23,6 @@
 ^build/mitsuba-msvc2010.sdf$
 ^build/mitsuba-msvc2010.suo$
 ^build/mitsuba-msvc2010.vcxproj.user$
-^build/mitsuba-msvc2008.ncb$
-^build/mitsuba-msvc2008.suo$
-^build/mitsuba-msvc2008\..*\.user$
 ^data/windows/mitsuba_res.res$
 ^dist/.*$
 
@@ -38,6 +34,7 @@
 
 # OSX binaries and byproducts
 ^Mitsuba.app/.*$
+^\.DS_Store$
 
 # Imported geometry and some default output types
 ^meshes/.*$