| ... | ... |
@@ -1,3 +1,8 @@ |
| 1 |
+2019-05-02 Steffen Neumann <sneumann@msbi-corei> |
|
| 2 |
+ |
|
| 3 |
+ * Rdisop-1.44.1: Merge fix by Max Helf for improved |
|
| 4 |
+ decomposeMass: element filter handling. |
|
| 5 |
+ |
|
| 1 | 6 |
2019-04-01 Steffen Neumann <sneumann@msbi-corei> |
| 2 | 7 |
|
| 3 | 8 |
* Rdisop-1.43.2: David Rasp helped to remove dependency |
| ... | ... |
@@ -1,7 +1,12 @@ |
| 1 | 1 |
Package: Rdisop |
| 2 | 2 |
Title: Decomposition of Isotopic Patterns |
| 3 |
+<<<<<<< Updated upstream |
|
| 3 | 4 |
Version: 1.45.0 |
| 4 | 5 |
Date: 2019-04-23 |
| 6 |
+======= |
|
| 7 |
+Version: 1.44.1 |
|
| 8 |
+Date: 2019-05-02 |
|
| 9 |
+>>>>>>> Stashed changes |
|
| 5 | 10 |
Author: Anton Pervukhin <apervukh@minet.uni-jena.de>, Steffen Neumann <sneumann@ipb-halle.de> |
| 6 | 11 |
Maintainer: Steffen Neumann <sneumann@ipb-halle.de> |
| 7 | 12 |
Description: Identification of metabolites using high precision mass |
