Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Development #36

Merged
merged 6 commits into from
Apr 12, 2024
Merged

Development #36

merged 6 commits into from
Apr 12, 2024

Conversation

nilshoffmann
Copy link
Member

Merge upstream and development changes into master.

nilshoffmann and others added 6 commits February 26, 2024 08:45
Merge last bioc release work into development
fab153388 more prostaglandins support
3af508085 Merge commit 'cdf1bbf5c3f9495e1bd6a6b7cdf6e4a8246b70f9'
ce56b4b3a adding even more support for oxylipins
cdf1bbf5c adding more support for oxylipins
8e2231d44 added triH
1a161caa5 Merge commit '93058c0c53af43484158666f7667e412533900dc'
93058c0c5 updated tri hydro information
fd0bd7f6a bug fixing on recursive function
a54eb4ed5 added ARA
c66a65497 Merge commit '3759dba1db3f35ecbd676122d2dd6a0cb5142f95'
615bd4b05 updated prostaglandins
3759dba1d updated trivial list
e8a8ce3fe Merge commit 'b9cd9277ccb82b64f1bb43b77db6f39468e7f606'
b9cd9277c added more support for oxylipins
649656c62 Merge commit '9946c54034cd8ffea235abfc28b79822690d5795'
9946c5403 adding more oxolipins
bd1d4ca4f updated unit tests
09932b8e5 Merge commit '9437c99f889d4bf246ca7d1e20857ccbb36a3603'
9437c99f8 updated trivial mediator table
61bdbb5e7 updated trivial mediators
abcbd0414 Merge commit 'd2ba69537010f6720d3ec2426e96c8ed71d69f67'
d2ba69537 added more trivial mediator dbs
f9d048bde added trivial mediator double bond information
ca7df904b Merge commit 'a3af90548efdd6383114521c9e2b7a3cebf68f01'
a3af90548 adding trivial mediator db information

git-subtree-dir: src/cppgoslin
git-subtree-split: fab153388eae650eeb98d0c88b315ff1656f2662
9ad782e22 Merge commit '37fa28110479dc9e74f8589cc381bebd9e27d01b'
37fa28110 fixed typo in trivial list
8b841231b Merge commit '8c58c13573c8993b48d9f59857b33bbec7cabe88'
8c58c1357 adding more HDoHE support

git-subtree-dir: src/cppgoslin
git-subtree-split: 9ad782e2200ed2f89d2921b4b3923874482e4f3c
Integrate upstream features for trivial mediators and prostaglandins.
@nilshoffmann nilshoffmann merged commit d714b70 into master Apr 12, 2024
5 of 6 checks passed
@nilshoffmann nilshoffmann deleted the development branch April 12, 2024 13:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants