[Pkg-cli-apps-commits] [fsharp] 02/05: Merge tag 'upstream/3.0.30+dfsg'

[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 fb4e193f57809c27ed1e3d147aa9c282d5ebb80b
Merge: b9a7007 1e7b167
Author: Christopher James Halse Rogers <raof at ubuntu.com>
Date:   Sun Oct 27 20:45:12 2013 +1100

    Merge tag 'upstream/3.0.30+dfsg'
    
    Upstream version 3.0.30+dfsg
    
    # gpg: Signature made Sun 27 Oct 2013 20:45:12 EST using RSA key ID E5923C18
    # gpg: Good signature from "Christopher James Halse Rogers <chalserogers at gmail.com>"
    # gpg:                 aka "Christopher James Halse Rogers <raof at ubuntu.com>"
    # gpg:                 aka "Christopher James Halse Rogers <christopher.halse.rogers at canonical.com>"
    # gpg:                 aka "Christopher James Halse Rogers <chris at cooperteam.net>"
    # gpg:                 aka "Christopher James Halse Rogers <chris at cooperteam.net>"

 .gitattributes                                     |    7 ++
 README.md                                          |    1 +
 build.bat                                          |   10 +-
 config.make.in                                     |   53 +++++-----
 configure.ac                                       |   35 ++++---
 src/FSharpSource.targets                           |    4 +-
 src/absil/il.fs                                    |    3 +
 src/fsharp/ErrorLogger.fs                          |    1 -
 src/fsharp/FSharp.Build/FSharp.Build.fsproj        |    3 +
 src/fsharp/FSharp.Build/Makefile.in                |    6 +-
 .../FSharp.Build/Microsoft.Portable.FSharp.Targets |   19 ++++
 src/fsharp/FSharp.Compiler-proto/Makefile.in       |    2 +-
 src/fsharp/FSharp.Compiler/Makefile.in             |    4 +-
 src/fsharp/FSharp.Core/Linq.fs                     |   15 +--
 src/fsharp/FSharp.Core/Makefile.in                 |    2 +-
 src/fsharp/FSharp.Core/control.fs                  |    6 +-
 src/fsharp/FSharp.Core/local.fs                    |    6 +-
 src/fsharp/FSharp.Core/prim-types.fs               |    4 +
 src/fsharp/FSharp.Core/prim-types.fsi              |    2 +-
 src/fsharp/FSharp.Core/quotations.fs               |    6 +-
 src/fsharp/Fsc-proto/Makefile.in                   |    4 +-
 src/fsharp/Fsc/Makefile.in                         |    4 +-
 src/fsharp/build.fs                                |    2 +
 src/fsharp/build.fsi                               |    1 +
 src/fsharp/fscopts.fs                              |    1 +
 src/fsharp/fsi/Makefile.in                         |    4 +-
 src/fsharp/fsiAnyCpu/Makefile.in                   |    4 +-
 src/fsharp/ilxgen.fs                               |    8 +-
 src/fsharp/targets.make                            |  108 +++++++++++++-------
 src/fsharp/vs/SimpleServices.fs                    |    4 +-
 tests/hosting/hosted.fsx                           |   24 ++++-
 ...012_FSharp_ConsoleApp_net40_upgraded_VS2013.sln |   20 ++++
 .../App.config                                     |   17 +++
 .../Program.fs                                     |   31 ++++++
 ..._FSharp_ConsoleApp_net40_upgraded_VS2013.fsproj |   76 ++++++++++++++
 .../PortableLibrary1.fs                            |    4 +
 .../Sample_VS2012_FSharp_Portable_Library.fsproj   |   57 +++++++++++
 .../Sample_VS2012_FSharp_Portable_Library.sln      |   20 ++++
 .../Script.fsx                                     |    6 ++
 39 files changed, 454 insertions(+), 130 deletions(-)

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