[Pkg-cli-apps-commits] [fsharp] 05/05: merge latest master

[Christopher Halse Rogers]

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

raof-guest pushed a commit to tag 3.1.1
in repository fsharp.

commit 1745b5f7b19bdb285f3a9c06527b22baf01d41f9
Merge: 5c0d595 b0c16bb
Author: Don Syme <donsyme at fastmail.fm>
Date:   Mon Dec 30 17:07:10 2013 +0100

    merge latest master

 README.md | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --cc README.md
index 9fe5262,e9f88e3..c9c8221
--- a/README.md
+++ b/README.md
@@@ -261,12 -218,9 +269,20 @@@ F# compiler sources dropped by Microsof
  Uses bootstrapping libraries, tools and F# compiler. The `lib/bootstrap/X.0` directories contain mono-built libraries, compiler and tools that can be used to bootstrap a build. You can also supply your own via the `--with-bootstrap` option.
  
  
 +### Wheezy build
 +
 +vagrant up
 +vagrant ssh
 +cd /vagrant
 +sudo apt-get install dos2unix autoconf
 +./autogen.sh --prefix=/usr
 +make
 +sudo make install
++
++
+ [teamcity mono icon]: http://teamcity.codebetter.com/app/rest/builds/buildType:(id:bt814)/statusIcon
+ [teamcity mono url]: http://teamcity.codebetter.com/viewType.html?buildTypeId=bt814&guest=1
+ [teamcity net40 icon]: http://teamcity.codebetter.com/app/rest/builds/buildType:(id:bt817)/statusIcon
+ [teamcity net40 url]: http://teamcity.codebetter.com/viewType.html?buildTypeId=bt817&guest=1
+ [teamcity net20 icon]: http://teamcity.codebetter.com/app/rest/builds/buildType:(id:bt827)/statusIcon
+ [teamcity net20 url]: http://teamcity.codebetter.com/viewType.html?buildTypeId=bt827&guest=1

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