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

Develop #16

Merged
merged 31 commits into from
Mar 29, 2018
Merged

Develop #16

merged 31 commits into from
Mar 29, 2018

Conversation

zhucaoxiang
Copy link
Collaborator

There are a lot of changes in the past half year. Please have a quick view of the commit messages and click the link to see the sources changed.

Caoxiang Zhu and others added 30 commits June 23, 2017 09:37
fix compiler specific bugs
…imize settings.

Fix NAG version conflicts temporarily, remove Oculus and knot conflicting parts.

Merge branch 'nag_fix' into develop
At line 389: total_coef = total_coef + (6*NF + 3)
@zhucaoxiang zhucaoxiang merged commit 7721192 into master Mar 29, 2018
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.

None yet

2 participants