delta/ruby-gems/json.git, branch v1.4.6-javagithub.com: flori/json
Merge branch 'master' into unified2010-08-09T08:06:00+00:00Daniel Luzdev@mernen.com2010-08-09T08:06:00+00:00844949a5b5266aac172bdc702b98754ad08811cf
Java: keep track of depth correctly2010-08-09T08:05:42+00:00Daniel Luzdev@mernen.com2010-08-09T08:05:42+00:00740a15d172cb44730aefd111eedb93e4d286df5b
Merge branch 'master' (early part) into unified2010-08-09T08:03:36+00:00Daniel Luzdev@mernen.com2010-08-09T08:03:36+00:00c6b99666806c387a061f589dd88a8638758c8e90
Java: do not forget to dup the state2010-08-09T08:03:19+00:00Daniel Luzdev@mernen.com2010-08-09T08:03:19+00:004223670e9cc38f46e08726162b14a2d0d8e94fd2
Merge branch 'master' (early part) into unified2010-08-09T08:02:56+00:00Daniel Luzdev@mernen.com2010-08-09T07:57:56+00:009acbc624e599ed8a865c0dedfa4378526c123526
prepare new version2010-08-09T07:25:11+00:00Florian Frankflori@ping.de2010-08-09T07:25:11+00:0072fae22ecd7c51fdf427de5b3e4bde81a244c42f
keep track of depth correctly2010-08-08T18:28:11+00:00Florian Frankflori@ping.de2010-08-08T18:28:11+00:00ae7a01f43d24dfe84b8ac2e2de505538e6011710
Merge remote branch 'mernen/master'2010-08-07T15:58:10+00:00Charles Oliver Nutterheadius@headius.com2010-08-07T15:58:10+00:00914cca595ccaed53da6d94698c6095fed3648f19
Merge branch 'master' of gate.dyna.ping.de:/git/json2010-08-07T10:09:22+00:00Florian Frankflori@ping.de2010-08-07T10:09:22+00:00e8ef17ece7ddacbe7dde00ec3cb8a96401e1882c
Conflicts:
tests/test_json_generate.rb
Conflicts:
tests/test_json_generate.rb
do not forget to dup the state2010-08-07T10:08:06+00:00Florian Frankflori@ping.de2010-08-07T09:09:56+00:001edf726ff3029e877350bc8db3217a64a74de581
use state for depth checking in pure as well