[Pkg-cli-apps-commits] [fsharp] 03/09: Merge branch 'master' of https://github.com/ovatsus/fsharp into ovatsus-master

[Christopher Halse Rogers]

This is an automated email from the git hooks/post-receive script.

raof-guest pushed a commit to branch master
in repository fsharp.

commit b00fa1d2c0de85b21590a5b32527031df8ececf5
Merge: 38e8642 6fda130
Author: Don Syme <donsyme at fastmail.fm>
Date:   Sat Nov 9 15:52:05 2013 +0000

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

 .gitattributes | 9 ++++-----
 .gitignore     | 4 +++-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --cc .gitattributes
index ac2ad93,2c1c35c..cfbf2c2
--- a/.gitattributes
+++ b/.gitattributes
@@@ -21,9 -21,7 +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
++*.sh text eol=lf

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/fsharp.git