Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository:stleary/JSON-java
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base:master
Choose a base ref
...
head repository:MarkusH/JSON-java
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare:master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 13 commits
  • 37 files changed
  • 2 contributors

Commits on Dec 8, 2011

  1. solve the warnings that result from the parameterized classes like Ma…

    …p and ArrayList by setting proper types and format the code with the "Eclipse [built-in]" format
    @MarkusH
    MarkusH committed Dec 8, 2011
    Configuration menu
    Copy the full SHA
    6d143f0View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2012

  1. apply directory structure

    @MarkusH
    MarkusH committed Jan 27, 2012
    Configuration menu
    Copy the full SHA
    efadf32View commit details
    Browse the repository at this point in the history

  2. fix file permissions

    @MarkusH
    MarkusH committed Jan 27, 2012
    Configuration menu
    Copy the full SHA
    91e0d82View commit details
    Browse the repository at this point in the history

  3. add OSGi Manifest and build properties

    @MarkusH
    MarkusH committed Jan 27, 2012
    Configuration menu
    Copy the full SHA
    6fd52cdView commit details
    Browse the repository at this point in the history

  4. fix line endings

    @MarkusH
    MarkusH committed Jan 27, 2012
    Configuration menu
    Copy the full SHA
    d9e2f4cView commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'upstream/master'

    @MarkusH
    MarkusH committed Jan 27, 2012
    Configuration menu
    Copy the full SHA
    8faff3aView commit details
    Browse the repository at this point in the history

  6. fix bundle version

    @MarkusH
    MarkusH committed Jan 27, 2012
    Configuration menu
    Copy the full SHA
    f78240aView commit details
    Browse the repository at this point in the history

  7. remove bundle-vendor

    @MarkusH
    MarkusH committed Jan 27, 2012
    Configuration menu
    Copy the full SHA
    4f6bed8View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2012

  1. update osgi version

    @MarkusH
    MarkusH committed Jan 28, 2012
    Configuration menu
    Copy the full SHA
    d20d3d3View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2012

  1. Merge remote-tracking branch 'upstream/master'

    @MarkusH
    MarkusH committed Apr 12, 2012
    Configuration menu
    Copy the full SHA
    ca522c3View commit details
    Browse the repository at this point in the history

  2. Add gitignore

    @MarkusH
    MarkusH committed Apr 12, 2012
    Configuration menu
    Copy the full SHA
    6b459feView commit details
    Browse the repository at this point in the history

  3. 1.0.0.2-osgi

    @MarkusH
    MarkusH committed Apr 12, 2012
    Configuration menu
    Copy the full SHA
    82a6250View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2012

  1. add the .classpath and .project file for the main repository to suppo…

    …rt smart imports into Eclipse
    @MarkusH
    MarkusH committed Oct 17, 2012
    Configuration menu
    Copy the full SHA
    5aa2178View commit details
    Browse the repository at this point in the history
Loading