Browse code

Merge branch 'master' into devel

* master:
bump version

git-svn-id: file:///home/git/hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/mzR@121804 bc3139a8-67e5-0310-9ffc-ced21a209358

Laurent Gatto authored on 05/10/2016 12:17:43
Showing 2 changed files

  • DESCRIPTION index 203a40df8..7a0984a3b 100644
  • NEWS index 776cb78f3..cba0fc440 100644
... ...
@@ -2,7 +2,7 @@ Package: mzR
2 2
 Type: Package
3 3
 Title: parser for netCDF, mzXML, mzData and mzML and mzIdentML files
4 4
        (mass spectrometry data)
5
-Version: 2.7.9
5
+Version: 2.7.10
6 6
 Author: Bernd Fischer, Steffen Neumann, Laurent Gatto, Qiang Kou
7 7
 Maintainer: Bernd Fischer <b.fischer@dkfz.de>,
8 8
 	    Steffen Neumann <sneumann@ipb-halle.de>,
... ...
@@ -1,3 +1,7 @@
1
+CHANGES IN VERSION 2.7.10
2
+-------------------------
3
+ o compiling and loading on Windows (hopefully)
4
+ 
1 5
 CHANGES IN VERSION 2.7.9
2 6
 ------------------------
3 7
  o Updating Makevars.win