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.

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

Jump to bottom

Dev #6

Merged
merged 5 commits into from Dec 21, 2015
Merged

Dev #6

merged 5 commits into from Dec 21, 2015

Commits on Oct 30, 2015

  1. Update for roxygen 5.0.0

    @wibeasley
    wibeasley committed Oct 30, 2015
    Configuration menu
    Copy the full SHA
    02a1fab View commit details
    Browse the repository at this point in the history

  2. Canonical package URL in readme

    @wibeasley
    wibeasley committed Oct 30, 2015
    Configuration menu
    Copy the full SHA
    927f80f View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2015

  1. conflict resolution during dev/master rebase

    @wibeasley
    wibeasley committed Dec 21, 2015
    Configuration menu
    Copy the full SHA
    60706ec View commit details
    Browse the repository at this point in the history

  2. Canonical package URL in readme

    @wibeasley
    wibeasley committed Dec 21, 2015
    Configuration menu
    Copy the full SHA
    4400146 View commit details
    Browse the repository at this point in the history

  3. conflict resolution during rebase 

    Merge branch 'dev' of github.com:OuhscBbmc/Wats into dev

Conflicts:
	DESCRIPTION
	DocumentationPeek.pdf
	README.md
    @wibeasley
    wibeasley committed Dec 21, 2015
    Configuration menu
    Copy the full SHA
    a4aa045 View commit details
    Browse the repository at this point in the history