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

Emergency develop merge #20

Merged
merged 14 commits into from
Jan 1, 2014
Merged

Emergency develop merge #20

merged 14 commits into from
Jan 1, 2014

Commits on Dec 22, 2013

  1. Moving version to 1.1.0-SNAPSHOT

    @oskopek
    oskopek committed Dec 22, 2013
    Configuration menu
    Copy the full SHA
    aca4377 View commit details
    Browse the repository at this point in the history

Commits on Dec 23, 2013

  1. Fixed javadoc

    @oskopek
    oskopek committed Dec 23, 2013
    Configuration menu
    Copy the full SHA
    b00acbd View commit details
    Browse the repository at this point in the history

Commits on Dec 26, 2013

  1. Updating travis.yml and pom.xml for coveralls

    @oskopek
    oskopek committed Dec 26, 2013
    Configuration menu
    Copy the full SHA
    199a488 View commit details
    Browse the repository at this point in the history

  2. Added coveralls badge to readme

    @oskopek
    oskopek committed Dec 26, 2013
    Configuration menu
    Copy the full SHA
    d0cdf4c View commit details
    Browse the repository at this point in the history

  3. Merge pull request #18 from oskopek/feature-coveralls 

    Coveralls code coverage
    @oskopek
    oskopek committed Dec 26, 2013
    Configuration menu
    Copy the full SHA
    160f4ac View commit details
    Browse the repository at this point in the history

  4. Updating dependencies (versions)

    @oskopek
    oskopek committed Dec 26, 2013
    Configuration menu
    Copy the full SHA
    0975e62 View commit details
    Browse the repository at this point in the history

Commits on Dec 28, 2013

  1. Added wafle.io badge

    @oskopek
    oskopek committed Dec 28, 2013
    Configuration menu
    Copy the full SHA
    f4a01e3 View commit details
    Browse the repository at this point in the history

Commits on Dec 29, 2013

  1. Updated README formatting

    @oskopek
    oskopek committed Dec 29, 2013
    Configuration menu
    Copy the full SHA
    7298f96 View commit details
    Browse the repository at this point in the history

  2. Updated README formatting2

    @oskopek
    oskopek committed Dec 29, 2013
    Configuration menu
    Copy the full SHA
    cad64c7 View commit details
    Browse the repository at this point in the history

  3. Updated README formatting3

    @oskopek
    oskopek committed Dec 29, 2013
    Configuration menu
    Copy the full SHA
    f80b1a4 View commit details
    Browse the repository at this point in the history

  4. Removed trailing whitespace

    @oskopek
    oskopek committed Dec 29, 2013
    Configuration menu
    Copy the full SHA
    89cb45c View commit details
    Browse the repository at this point in the history

Commits on Jan 1, 2014

  1. Happy New Year 2014! Fixed copyright notices

    @oskopek
    oskopek committed Jan 1, 2014
    Configuration menu
    Copy the full SHA
    4e82326 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into develop 

    Conflicts:
	carcv-core/pom.xml
	carcv-cpp/pom.xml
	carcv-webapp/pom.xml
	pom.xml
    @oskopek
    oskopek committed Jan 1, 2014
    Configuration menu
    Copy the full SHA
    04842fc View commit details
    Browse the repository at this point in the history

  3. Added .orig files to gitignore

    @oskopek
    oskopek committed Jan 1, 2014
    Configuration menu
    Copy the full SHA
    9abdf39 View commit details
    Browse the repository at this point in the history