Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 99397fad74d3e47c27073f44e36300d43f48a181 https://github.com/galaxyproject/galaxy/commit/99397fad74d3e47c27073f44e3630... Author: lecorguille lecorguille@users.noreply.github.com Date: 2017-02-24 (Fri, 24 Feb 2017)

Changed paths: M config/datatypes_conf.xml.sample M lib/galaxy/datatypes/proteomics.py

Log Message: ----------- add the mzData datatype

Commit: 036df2ac2003ab378f6a0227e4642d980639a5ab https://github.com/galaxyproject/galaxy/commit/036df2ac2003ab378f6a0227e4642... Author: Björn Grüning bjoern@gruenings.eu Date: 2017-02-24 (Fri, 24 Feb 2017)

Changed paths: M lib/galaxy/datatypes/proteomics.py

Log Message: ----------- Fix linting

Commit: d5e4dc4753b8e6ab4a079b5fedb0ad1834bda157 https://github.com/galaxyproject/galaxy/commit/d5e4dc4753b8e6ab4a079b5fedb0a... Author: Björn Grüning bjoern@gruenings.eu Date: 2017-02-24 (Fri, 24 Feb 2017)

Changed paths: M config/datatypes_conf.xml.sample M lib/galaxy/datatypes/proteomics.py

Log Message: ----------- Merge pull request #3661 from lecorguille/datatype_mzdata

add the mzData datatype

Compare: https://github.com/galaxyproject/galaxy/compare/73c444eaf407...d5e4dc4753b8