Merge pull request #153 from OPM/dev

ResInsight 1.1.0
OPM · Jan 23, 2014 · f689682 · f689682
2 parents 03f04ac + 2ed3743
commit f689682
Show file tree

Hide file tree

Showing 1,866 changed files with 531,124 additions and 6,217 deletions.
diff --git a/.gitignore b/.gitignore
@@ -33,3 +33,35 @@ CTest*.cmake
 # Target program
 /ApplicationCode/ResInsight
 /.project
+
+#Visual Studio files
+*.[Oo]bj
+*.user
+*.aps
+*.pch
+*.vspscc
+*.vssscc
+*_i.c
+*_p.c
+*.ncb
+*.suo
+*.tlb
+*.tlh
+*.bak
+*.[Cc]ache
+*.ilk
+*.log
+*.lib
+*.sbr
+*.sdf
+*.opensdf
+*.unsuccessfulbuild
+ipch/
+[Oo]bj/
+[Bb]in
+[Dd]ebug*/
+[Rr]elease*/
+Ankh.NoLoad
+
+#Temp files
+*.temp