Merge branch 'master' into devel

* master: (340 commits) sort out news before committing to bioc Fix issue #48 Add some documentation and link to travis CI add sudo to travis CI config add build dependency to travis CI config Adding travis for master branch make sure we are using the latest version of pwiz update version number resolve conflicts in Makevars.win pass on Linux update description Recompile libpwiz.a on windows remove std::cout/std::cerr cleanup compiled checkout latest pwiz revert added compiler switch, and fixed boost code instead to get rid of warnings forgot to update windows file in #33 bump version and add KK's new pwiz.version to NEWS pwiz version ...
sneumann · Aug 26, 2016 · e7528e9 · e7528e9
2 parents d2f3523 + 39bf5d5
commit e7528e9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,4 @@
+language: r
+r: bioc-devel
+sudo: true
+apt_packages: libnetcdf-dev
diff --git a/src/boost/numeric/conversion/detail/old_numeric_cast.hpp b/src/boost/numeric/conversion/detail/old_numeric_cast.hpp