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: nxtbgthng/json-framework
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: CodeKollektiv/json-framework
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.
  • 9 commits
  • 22 files changed
  • 3 contributors

Commits on Sep 14, 2010

  1. Fixed build settings & imports for framework target 

    - switched headers to public
- added compiler switch for framework #import
    @stigi
    stigi committed Sep 14, 2010
    Configuration menu
    Copy the full SHA
    37358ec View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2010

  1. Fixed static library target to compile on armv6 & armv7

    @stigi
    stigi committed Oct 14, 2010
    Configuration menu
    Copy the full SHA
    eb36674 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of git://github.com/stig/json-framework 

    Conflicts:
	JSON.xcodeproj/project.pbxproj
    @stigi
    stigi committed Oct 14, 2010
    Configuration menu
    Copy the full SHA
    64e7fba View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2011

  1. Set base SDK for iOS to latest

    @stigi
    stigi committed Feb 9, 2011
    Configuration menu
    Copy the full SHA
    714e437 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2011

  1. Changed SDKROOT for debug configuration in static library 

    Set ti lates ios
    @stigi
    stigi committed Feb 14, 2011
    Configuration menu
    Copy the full SHA
    3af002e View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2011

  1. force ios sdk version to current so xcode4 does not complain anymore

    @toto
    toto committed Feb 23, 2011
    Configuration menu
    Copy the full SHA
    14828c8 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2011

  1. Moved Header in JSON subdir

    @chbeer
    chbeer committed Feb 25, 2011
    Configuration menu
    Copy the full SHA
    b76d922 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2011

  1. Moved headers

    @chbeer
    chbeer committed Mar 13, 2011
    Configuration menu
    Copy the full SHA
    91c8a5a View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2011

  1. Improved

    @chbeer
    chbeer committed Apr 8, 2011
    Configuration menu
    Copy the full SHA
    ee56aac View commit details
    Browse the repository at this point in the history
Loading