Permalink
Commits on Oct 5, 2010
  1. Merge branch 'integrate-jruby'

    flori committed Oct 5, 2010
    Conflicts:
    	Rakefile
Commits on Sep 27, 2010
Commits on Sep 22, 2010
Commits on Sep 17, 2010
  1. use long instead of int

    flori committed Sep 17, 2010
Commits on Aug 20, 2010
  1. better debugging message

    flori committed Aug 20, 2010
Commits on Aug 18, 2010
  1. Merge branch 'master' of gate.dyna.ping.de:/git/json

    flori committed Aug 18, 2010
    Conflicts:
    	CHANGES
    	VERSION
    	lib/json/version.rb
  2. prepare new version

    flori committed Aug 12, 2010
    fixed some warnings
    wrote some rake tasks to build jruby extension
  3. prepare new version

    flori committed Aug 9, 2010
  4. Java: keep track of depth correctly

    mernen authored and flori committed Aug 9, 2010
  5. keep track of depth correctly

    flori committed Aug 8, 2010
Commits on Aug 9, 2010
  1. prepare new version

    flori committed Aug 9, 2010
Commits on Aug 8, 2010
  1. keep track of depth correctly

    flori committed Aug 8, 2010
Commits on Aug 7, 2010
  1. Merge branch 'master' of gate.dyna.ping.de:/git/json

    flori committed Aug 7, 2010
    Conflicts:
    	tests/test_json_generate.rb
  2. do not forget to dup the state

    flori committed Aug 7, 2010
    use state for depth checking in pure as well
  3. do not forget to dup the state

    flori committed Aug 7, 2010
  4. Java: manage depth in state

    mernen committed Aug 7, 2010
Commits on Aug 6, 2010
  1. changed CHANGES

    flori committed Aug 6, 2010
  2. mange depth in state

    flori committed Aug 6, 2010
  3. new version

    flori committed Aug 6, 2010
  4. some code cleanup

    flori committed Aug 6, 2010