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: oftc/jsoncpp
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: vendor
Choose a base ref
...
head repository: oftc/jsoncpp
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.
  • 17 commits
  • 15 files changed
  • 2 contributors

Commits on Jun 23, 2012

  1. Initial commit

    @cryogen
    cryogen committed Jun 23, 2012
    Configuration menu
    Copy the full SHA
    7cf3185 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2012

  1. remove scons and replace with gyp build system

    @cryogen
    cryogen committed Jul 5, 2012
    Configuration menu
    Copy the full SHA
    de4688a View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2012

  1. add gitignore

    @cryogen
    cryogen committed Jul 10, 2012
    Configuration menu
    Copy the full SHA
    3b1acae View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2012

  1. add gitattributes

    @cryogen
    cryogen committed Jul 12, 2012
    Configuration menu
    Copy the full SHA
    390ea51 View commit details
    Browse the repository at this point in the history

  2. normalize line endings

    @cryogen
    cryogen committed Jul 12, 2012
    Configuration menu
    Copy the full SHA
    887db45 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2012

  1. update gitignore

    @cryogen
    cryogen committed Jul 18, 2012
    Configuration menu
    Copy the full SHA
    d1da6b6 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2012

  1. Switch to clang/libc++

    @cryogen
    cryogen committed Jul 19, 2012
    Configuration menu
    Copy the full SHA
    207ea5d View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2012

  1. make it compile on os x

    @tjfontaine
    tjfontaine committed Jul 20, 2012
    Configuration menu
    Copy the full SHA
    eaa3e56 View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2012

  1. use libstdc++ again

    @cryogen
    cryogen committed Aug 9, 2012
    Configuration menu
    Copy the full SHA
    35f2db3 View commit details
    Browse the repository at this point in the history

  2. tj still wants libc++ so put it back for xcode

    @cryogen
    cryogen committed Aug 9, 2012
    Configuration menu
    Copy the full SHA
    7af42f7 View commit details
    Browse the repository at this point in the history

  3. update gitignore

    @cryogen
    cryogen committed Aug 9, 2012
    Configuration menu
    Copy the full SHA
    46f6e12 View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2012

  1. update gyp to compile on freebsd with clang

    @cryogen
    cryogen committed Sep 9, 2012
    Configuration menu
    Copy the full SHA
    d5cddfb View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2012

  1. don't use libc++ on freebsd for now

    @cryogen
    cryogen committed Sep 14, 2012
    Configuration menu
    Copy the full SHA
    2eb2888 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:oftc/oftc-ircd

    @cryogen
    cryogen committed Sep 14, 2012
    Configuration menu
    Copy the full SHA
    72da4fd View commit details
    Browse the repository at this point in the history

  3. Merge commit '2eb28883bc2b4e8e28bc7259a4e872bedc3bb5a4'

    @cryogen
    cryogen committed Sep 14, 2012
    Configuration menu
    Copy the full SHA
    fbdbab1 View commit details
    Browse the repository at this point in the history

  4. disable libc++ for freebsd for now

    @cryogen
    cryogen committed Sep 14, 2012
    Configuration menu
    Copy the full SHA
    b07a96e View commit details
    Browse the repository at this point in the history

  5. fix merge conflict

    @cryogen
    cryogen committed Sep 14, 2012
    Configuration menu
    Copy the full SHA
    066e7e0 View commit details
    Browse the repository at this point in the history
Loading