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

Conflicts:
	.gitattributes

Author: dsyme

.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

.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