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: ciaranj/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.
  • 10 commits
  • 12 files changed
  • 3 contributors

Commits on Aug 9, 2011

  1. add maven pom.xml file

    @ansell
    ansell committed Aug 9, 2011
    Configuration menu
    Copy the full SHA
    e6522ba View commit details
    Browse the repository at this point in the history

  2. add .gitignore file for eclipse and maven directories

    @ansell
    ansell committed Aug 9, 2011
    Configuration menu
    Copy the full SHA
    401fcdf View commit details
    Browse the repository at this point in the history

  3. make JSONObject use ordered map so that tests won't randomly fail 

    (when/if they are updated to use String lexical ordering)
    @ansell
    ansell committed Aug 9, 2011
    Configuration menu
    Copy the full SHA
    316223d View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2011

  1. * Added an And build file

    @ansell
    Aidan Delaney authored and ansell committed Aug 10, 2011
    Configuration menu
    Copy the full SHA
    063db7f View commit details
    Browse the repository at this point in the history

  2. manually merge generics changes from dslmeinte@2e2bd9d

    @ansell
    ansell committed Aug 10, 2011
    Configuration menu
    Copy the full SHA
    55c2287 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of [email protected]:ansell/JSON-java.git

    @ansell
    ansell committed Aug 10, 2011
    Configuration menu
    Copy the full SHA
    982d585 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2011

  1. manually apply patch from 5a4fb65#diff-0

    @ansell
    ansell committed Aug 29, 2011
    Configuration menu
    Copy the full SHA
    440c672 View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2011

  1. Update build script to ignore the test class unless explicitly requir… 

    …ed. (As Junit isn't bundled this allows people to build out of the box)
    @ciaranj
    ciaranj committed Sep 7, 2011
    Configuration menu
    Copy the full SHA
    17eb755 View commit details
    Browse the repository at this point in the history

  2. Add build & dist to .gitignore

    @ciaranj
    ciaranj committed Sep 7, 2011
    Configuration menu
    Copy the full SHA
    ac8b3b8 View commit details
    Browse the repository at this point in the history

  3. Add missing imports

    @ciaranj
    ciaranj committed Sep 7, 2011
    Configuration menu
    Copy the full SHA
    fcd3ef0 View commit details
    Browse the repository at this point in the history
Loading