| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into unifiedv1.4.6-java | Daniel Luz | 2010-08-09 | 3 | -2/+6 |
| |\ | |||||
| | * | prepare new versionv1.4.6 | Florian Frank | 2010-08-09 | 3 | -2/+6 |
| * | | Java: keep track of depth correctly | Daniel Luz | 2010-08-09 | 1 | -0/+1 |
| * | | Merge branch 'master' (early part) into unified | Daniel Luz | 2010-08-09 | 2 | -5/+2 |
| |\ \ | |/ | |||||
| | * | keep track of depth correctly | Florian Frank | 2010-08-08 | 2 | -5/+2 |
| * | | Java: do not forget to dup the state | Daniel Luz | 2010-08-09 | 1 | -1/+1 |
| * | | Merge branch 'master' (early part) into unified | Daniel Luz | 2010-08-09 | 3 | -77/+77 |
| |\ \ | |/ | |||||
| | * | Merge branch 'master' of gate.dyna.ping.de:/git/json | Florian Frank | 2010-08-07 | 0 | -0/+0 |
| | |\ | |||||
| | | * | do not forget to dup the state | Florian Frank | 2010-08-07 | 2 | -2/+11 |
| | * | | do not forget to dup the state | Florian Frank | 2010-08-07 | 3 | -77/+77 |
| | |/ | |||||
| * | | Merge remote branch 'mernen/master' | Charles Oliver Nutter | 2010-08-07 | 4 | -83/+110 |
| |\ \ | |||||
| | * | | Java: made the OptionsReader instantiation less silly | Daniel Luz | 2010-08-07 | 2 | -14/+9 |
| | * | | Java: fixed Generator::State setters for String values | Daniel Luz | 2010-08-07 | 1 | -6/+3 |
| | * | | Java: copy depth in State#initialize_copy | Daniel Luz | 2010-08-07 | 1 | -0/+1 |
| | * | | Added Java build files to gitignore | Daniel Luz | 2010-08-07 | 1 | -0/+13 |
| | * | | Merge remote branch 'flori/master' | Daniel Luz | 2010-08-07 | 4 | -4/+59 |
| | |\ \ | | |/ | |||||
| | * | | Java: manage depth in state | Daniel Luz | 2010-08-07 | 2 | -63/+84 |
| | * | | Merge remote branch 'flori/master' | Daniel Luz | 2010-08-07 | 6 | -102/+155 |
| | |\ \ | |||||
| * | \ \ | Merge remote branch 'flori/master' | Charles Oliver Nutter | 2010-08-06 | 9 | -106/+214 |
| |\ \ \ \ | |/ / / |/| | / | | |/ | |/| | |||||
| | * | | do not freeze to allow chaging defaultsv1.4.5 | Florian Frank | 2010-08-07 | 2 | -3/+4 |
| | * | | added missing methods to State + tests | Florian Frank | 2010-08-07 | 2 | -1/+51 |
| | * | | changed CHANGES | Florian Frank | 2010-08-07 | 1 | -0/+4 |
| | |/ | |||||
| | * | mange depth in state | Florian Frank | 2010-08-07 | 3 | -68/+120 |
| | * | new version | Florian Frank | 2010-08-06 | 2 | -2/+2 |
| | * | some code cleanup | Florian Frank | 2010-08-06 | 2 | -32/+33 |
| * | | Merge remote branch 'flori/master'v1.4.4-java | Charles Oliver Nutter | 2010-08-06 | 9 | -180/+277 |
| |\ \ | |/ | |||||
| | * | Prepare new versionv1.4.4 | Florian Frank | 2010-08-06 | 3 | -2/+6 |
| | * | make sure to use toplevel ::Encoding | Florian Frank | 2010-08-06 | 1 | -8/+9 |
| | * | changed documentation | Florian Frank | 2010-08-06 | 1 | -7/+5 |
| | * | cleaned up code a bit | Florian Frank | 2010-08-06 | 1 | -12/+6 |
| | * | use sdoc | Florian Frank | 2010-08-06 | 1 | -1/+1 |
| | * | Merge branch 'master' of gate.dyna.ping.de:/git/json | Florian Frank | 2010-08-05 | 0 | -0/+0 |
| | |\ | |||||
| | | * | Revert "use method dispatch for generation again" | Florian Frank | 2010-08-05 | 4 | -271/+272 |
| | * | | Revert "use method dispatch for generation again" | Florian Frank | 2010-08-05 | 4 | -261/+293 |
| | |/ | |||||
| | * | Revert "use method dispatch for generation again" | Florian Frank | 2010-08-05 | 2 | -30/+8 |
| | * | use method dispatch for generation again | Florian Frank | 2010-08-03 | 2 | -8/+30 |
| | * | use rb_funcall for duping | Florian Frank | 2010-08-03 | 1 | -3/+4 |
| | * | Merge branch 'master' of github.com:/flori/json | Florian Frank | 2010-08-03 | 2 | -3/+8 |
| | |\ | |||||
| | * | | use method dispatch for generation again | Florian Frank | 2010-07-24 | 3 | -197/+264 |
| * | | | Move json-jruby.gemspec to json-java.gemspec. | Charles Oliver Nutter | 2010-08-03 | 1 | -0/+0 |
| * | | | Merge JRuby-compatible extension into json proper. | Charles Oliver Nutter | 2010-08-03 | 21 | -0/+6002 |
| | |/ |/| | |||||
| * | | Zero out the generator struct to avoid GC problems | Jake Douglas | 2010-08-03 | 1 | -0/+1 |
| * | | Fix header conflict problem with OSX's ruby.framework | Evan Phoenix | 2010-08-03 | 1 | -2/+6 |
| * | | fix tha use of REALLOC_N. | NARUSE, Yui | 2010-05-09 | 1 | -1/+1 |
| |/ | |||||
| * | Merge branch 'master' of github.com:/flori/json | Florian Frank | 2010-05-05 | 1 | -6/+6 |
| |\ | |||||
| | * | Fix wrong assertion: use assert_equal. | NARUSE, Yui | 2010-05-03 | 1 | -6/+6 |
| * | | Fix for subclassed core classes, github issue 20v1.4.3 | Florian Frank | 2010-05-05 | 5 | -138/+145 |
| |/ | |||||
| * | Revert "simplified build structure"v1.4.2 | Joshua Peek | 2010-04-28 | 9 | -17/+20 |
| * | new version | Florian Frank | 2010-04-28 | 1 | -1/+1 |
| * | changed the CHANGES | Florian Frank | 2010-04-28 | 1 | -0/+2 |
 |
index : delta/ruby-gems/json.git | |
| github.com: flori/json |
| summaryrefslogtreecommitdiff |