Skip to content

Rebase #6

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.

Sign up for GitHub

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

Merged
merged 8 commits into from
Apr 29, 2015
Merged

Rebase #6

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1a18b47
Update README.md
erikzenker Mar 24, 2015
7784452
Update README.md
erikzenker Mar 24, 2015
8692724
Merge pull request #26 from erikzenker/dev
erikzenker Mar 30, 2015
fadabed
Merge pull request #27 from erikzenker/dev
erikzenker Apr 1, 2015
0f34144
Merge pull request #28 from erikzenker/dev
erikzenker Apr 1, 2015
11b50ac
Merge pull request #31 from erikzenker/dev
erikzenker Apr 12, 2015
ac249aa
manual merge
erikzenker Apr 29, 2015
c6894d2
Merge branch 'erikzenker-dev' into dev
erikzenker Apr 29, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@ GrayBat is licensed under the <b>GPLv3+</b>. Please refer to our [LICENSE.md](L

* **clean**: Cleanup build directory

##Literature##
* Talk by Erik Zenker of his diploma defence [![DOI](https://zenodo.org/badge/doi/10.5281/zenodo.16306.svg)](http://dx.doi.org/10.5281/zenodo.16306)


##Authors##

Expand Down