summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Support building of fat binary gemv1.5.1Florian Frank2011-01-265-6/+26
* renamed :match argument to :match_stringv1.5.0Florian Frank2011-01-057-35/+37
* avoid object creationFlorian Frank2011-01-032-42/+38
* Merge branch 'master' of gate.dyna.ping.de:/git/jsonFlorian Frank2011-01-030-0/+0
|\
| * Merge branch 'integrate-jruby'Florian Frank2010-10-056-983/+8
| |\
| | * started to build jruby extension with RakefileFlorian Frank2010-09-2729-1177/+272
* | | Merge branch 'string-matching'Florian Frank2011-01-0218-321/+505
|\ \ \
| * | | Rubinius' strscan already has a @match ivarFlorian Frank2011-01-024-5/+7
| * | | query if ruby/st.h existsFlorian Frank2011-01-022-0/+5
| * | | fixed test setupFlorian Frank2011-01-029-52/+33
| * | | implement string matching for java parserFlorian Frank2011-01-026-300/+348
| * | | Added matching in pure/ext parserFlorian Frank2011-01-026-54/+202
| * | | stop ignore java project configsFlorian Frank2011-01-021-7/+0
| * | | make sure bytes is a 8-bit string on all rubiesFlorian Frank2011-01-021-2/+7
| * | | Fix for ruby 1.9 const_defined? methodFlorian Frank2011-01-025-8/+19
| * | | obsoleted json/add/rails definitionsFlorian Frank2011-01-022-198/+4
| * | | use JSON.iconv abstractionFlorian Frank2011-01-026-75/+25
| * | | speed upShota Fukumori (sora_h)2011-01-021-4/+6
| * | | never use iconvShota Fukumori (sora_h)2011-01-022-9/+14
| * | | build jruby extension with RakefileFlorian Frank2011-01-026-983/+8
| |/ /
* | | stop ignore java project configsFlorian Frank2011-01-011-7/+0
* | | make sure bytes is a 8-bit string on all rubiesFlorian Frank2011-01-011-2/+7
* | | Fix for ruby 1.9 const_defined? methodFlorian Frank2011-01-015-8/+19
* | | obsoleted json/add/rails definitionsFlorian Frank2011-01-012-198/+4
* | | use JSON.iconv abstractionFlorian Frank2011-01-016-75/+25
* | | speed upShota Fukumori (sora_h)2011-01-011-4/+6
* | | never use iconvShota Fukumori (sora_h)2011-01-012-9/+14
* | | started to build jruby extension with RakefileFlorian Frank2011-01-016-983/+8
|/ /
* | started to build jruby extension with RakefileFlorian Frank2010-09-2324-198/+268
|/
* silenced "already initialized constant" warningsFlorian Frank2010-09-173-2/+5
* use long instead of intFlorian Frank2010-09-172-27/+27
* better debugging messageFlorian Frank2010-08-202-2/+3
* Merge branch 'master' of gate.dyna.ping.de:/git/jsonFlorian Frank2010-08-180-0/+0
|\
| * prepare new versionv1.4.6Florian Frank2010-08-093-2/+6
| * keep track of depth correctlyFlorian Frank2010-08-082-5/+2
* | prepare new versionFlorian Frank2010-08-1814-60/+210
* | optimisation and deleted some redundant semicolonsFlorian Frank2010-08-182-9/+8
* | prepare new versionFlorian Frank2010-08-183-2/+6
* | Java: keep track of depth correctlyDaniel Luz2010-08-181-0/+1
* | keep track of depth correctlyFlorian Frank2010-08-182-5/+2
* | Java: do not forget to dup the stateDaniel Luz2010-08-091-1/+1
* | Merge branch 'master' (early part) into unifiedDaniel Luz2010-08-093-77/+77
|\ \ | |/
| * Merge branch 'master' of gate.dyna.ping.de:/git/jsonFlorian Frank2010-08-070-0/+0
| |\
| | * do not forget to dup the stateFlorian Frank2010-08-072-2/+11
| * | do not forget to dup the stateFlorian Frank2010-08-073-77/+77
| |/
* | Merge remote branch 'mernen/master'Charles Oliver Nutter2010-08-074-83/+110
|\ \
| * | Java: made the OptionsReader instantiation less sillyDaniel Luz2010-08-072-14/+9
| * | Java: fixed Generator::State setters for String valuesDaniel Luz2010-08-071-6/+3
| * | Java: copy depth in State#initialize_copyDaniel Luz2010-08-071-0/+1
| * | Added Java build files to gitignoreDaniel Luz2010-08-071-0/+13