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

Jg concordance4 #134

Closed
wants to merge 7 commits into from
Closed

Jg concordance4 #134

wants to merge 7 commits into from

Commits on Jan 8, 2016

  1. incorporated annotation join, but lots of type erasure errors

    @jigold
    jigold committed Jan 8, 2016
    Configuration menu
    Copy the full SHA
    6e61831 View commit details
    Browse the repository at this point in the history

  2. incorporated annotation join, but lots of type erasure errors

    @jigold
    jigold committed Jan 8, 2016
    Configuration menu
    Copy the full SHA
    05d2ed7 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2016

  1. got merge to work -- need to clean up extra type/class tags

    @jigold
    jigold committed Jan 11, 2016
    Configuration menu
    Copy the full SHA
    c7acd10 View commit details
    Browse the repository at this point in the history

  2. Implemented join with simple annotation merge

    @jigold
    jigold committed Jan 11, 2016
    Configuration menu
    Copy the full SHA
    cda52f1 View commit details
    Browse the repository at this point in the history

  3. Implemented join with simple annotation merge -- no serialization errors

    @jigold
    jigold committed Jan 11, 2016
    Configuration menu
    Copy the full SHA
    ffee693 View commit details
    Browse the repository at this point in the history

  4. Implemented join with simple annotation merge -- no serialization errors

    @jigold
    jigold committed Jan 11, 2016
    Configuration menu
    Copy the full SHA
    ce94202 View commit details
    Browse the repository at this point in the history

  5. Implemented join with simple annotation merge -- no serialization errors

    @jigold
    jigold committed Jan 11, 2016
    Configuration menu
    Copy the full SHA
    1ed09bb View commit details
    Browse the repository at this point in the history