Skip to content
Browse files

Merge branch 'master' of https://github.com/ovatsus/fsharp into ovats…

…us-master

Conflicts:
	.gitattributes
  • Loading branch information...
2 parents 38e8642 + 6fda130 commit b00fa1d2c0de85b21590a5b32527031df8ececf5 @dsyme dsyme committed Nov 9, 2013
Showing with 7 additions and 6 deletions.
  1. +4 −5 .gitattributes
  2. +3 −1 .gitignore
View
9 .gitattributes
@@ -21,9 +21,8 @@
*.rtf diff=astextplain
*.RTF diff=astextplain
-autogen.sh text eol=lf
-launcher.in text eol=lf
-config.make.in text eol=lf
targets.make text eol=lf
-configure.ac text eol=lf
-Makefile.in text eol=lf
+install-sh text eol=lf
+*.in text eol=lf
+*.ac text eol=lf
+*.sh text eol=lf
View
4 .gitignore
@@ -53,4 +53,6 @@ src/fsharp/FSharp.Compiler-proto/pars.fsi
tests/projects/Sample_VS2012_FSharp_ConsoleApp_net45_with_resource/Sample_VS2012_FSharp_ConsoleApp_net45/Sample_VS2012_FSharp_ConsoleApp_net45.sln
tests/projects/Sample_VS2012_FSharp_ConsoleApp_net45_with_resource/Sample_VS2012_FSharp_ConsoleApp_net45/Sample_VS2012_FSharp_ConsoleApp_net45.userprefs
*.suo
-obj
+obj
+src/fsharp/FSharp.Data.TypeProviders/FSData.resx
+src/fsharp/fsiAnyCpu/FSIstrings.resx

0 comments on commit b00fa1d

Please sign in to comment.
Something went wrong with that request. Please try again.