summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'flori/master'v1.4.4-javaCharles Oliver Nutter2010-08-069-180/+277
|\
| * Prepare new versionv1.4.4Florian Frank2010-08-063-2/+6
| * make sure to use toplevel ::EncodingFlorian Frank2010-08-061-8/+9
| * changed documentationFlorian Frank2010-08-061-7/+5
| * cleaned up code a bitFlorian Frank2010-08-061-12/+6
| * use sdocFlorian Frank2010-08-061-1/+1
| * Merge branch 'master' of gate.dyna.ping.de:/git/jsonFlorian Frank2010-08-050-0/+0
| |\
| | * Revert "use method dispatch for generation again"Florian Frank2010-08-054-271/+272
| * | Revert "use method dispatch for generation again"Florian Frank2010-08-054-261/+293
| |/
| * Revert "use method dispatch for generation again"Florian Frank2010-08-052-30/+8
| * use method dispatch for generation againFlorian Frank2010-08-032-8/+30
| * use rb_funcall for dupingFlorian Frank2010-08-031-3/+4
| * Merge branch 'master' of github.com:/flori/jsonFlorian Frank2010-08-032-3/+8
| |\
| * | use method dispatch for generation againFlorian Frank2010-07-243-197/+264
* | | Move json-jruby.gemspec to json-java.gemspec.Charles Oliver Nutter2010-08-031-0/+0
* | | Merge JRuby-compatible extension into json proper.Charles Oliver Nutter2010-08-0321-0/+6002
| |/ |/|
* | Zero out the generator struct to avoid GC problemsJake Douglas2010-08-031-0/+1
* | Fix header conflict problem with OSX's ruby.frameworkEvan Phoenix2010-08-031-2/+6
* | fix tha use of REALLOC_N.NARUSE, Yui2010-05-091-1/+1
|/
* Merge branch 'master' of github.com:/flori/jsonFlorian Frank2010-05-051-6/+6
|\
| * Fix wrong assertion: use assert_equal.NARUSE, Yui2010-05-031-6/+6
* | Fix for subclassed core classes, github issue 20v1.4.3Florian Frank2010-05-055-138/+145
|/
* Revert "simplified build structure"v1.4.2Joshua Peek2010-04-289-17/+20
* new versionFlorian Frank2010-04-281-1/+1
* changed the CHANGESFlorian Frank2010-04-281-0/+2
* Free the buffer content as well.Florian Frank2010-04-281-1/+1
* prepare for 1.4.2 releaseFlorian Frank2010-04-262-1/+6
* allow building of json_pure if extensiontask is not presentdevrandom2010-04-261-1/+3
* Get rid of a warning.NARUSE, Yui2010-04-261-1/+1
* Fix mixed declarations and code.NARUSE, Yui2010-04-263-11/+20
* Fixed T_FIXNUM bug on 64bit architectures.v1.4.1Florian Frank2010-04-257-14/+30
* Forgot to add the changes.Florian Frank2010-04-231-0/+4
* Merge branch 'rbx-fix'v1.4.0Florian Frank2010-04-2310-88/+41
|\
| * does compile now, but causes a crashFlorian Frank2010-03-203-21/+32
* | Prepare for version 1.4.0 releaseFlorian Frank2010-04-232-2/+2
* | avoid superflous ifFlorian Frank2010-04-081-3/+3
* | Merged in const_missing triggering from v1.2Florian Frank2010-04-084-7/+15
|\ \ | |/ |/|
| * Trigger const_missing mechanism for RailsFlorian Frank2010-04-086-9/+17
* | Merge commit 'v1.2.3'Florian Frank2010-03-1310-75/+171
|\ \ | |/
| * added [] method to State objectsv1.2.3Florian Frank2010-03-116-5/+34
| * Compatibility to Rubiniusv1.2.2Florian Frank2010-02-278-128/+112
| * avoid rdoc issue, thx to github user spier.v1.2.1Florian Frank2009-12-071-3/+3
| * serialise symbols in add/coreFlorian Frank2009-12-031-0/+13
| * benchmark symbolized namesFlorian Frank2009-12-031-0/+14
| * implemented symbolize_names feature, #8Florian Frank2009-11-258-97/+154
* | Improved some testsFlorian Frank2010-02-2710-50/+33
* | avoid rdoc issue, thx to github user spier.Florian Frank2009-12-071-3/+3
* | benchmark symbolize_namesFlorian Frank2009-12-032-0/+28
* | serialise symbols in add/coreFlorian Frank2009-12-031-0/+13
* | deleted lineFlorian Frank2009-11-221-1/+0