Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

SHA1 Hash:	796dcfe0728bb2bc865db84e50432f0205d1d2fd
Date:	2011-11-04 20:57:52
User:	drh
Edited Comment:	Merge the json branch into trunk. Json is disabled by default for now. Use the --enable-json option to configure, or set FOSSIL_ENABLE_JSON in the makefile to turn json processing on.
Original Comment:	Merge the json branch into trunk. Json is disabled by default for now. Use the --json option to configure, or set FOSSIL_ENABLE_JSON in the makefile to turn json processing on.

• branch=trunk inherited from [bf1c21ba16]
• comment=Merge the json branch into trunk. Json is disabled by default for now. Use the --enable-json option to configure, or set FOSSIL_ENABLE_JSON in the makefile to turn json processing on. added by [9a67c9aac6] on 2011-11-04 21:12:36
• sym-trunk inherited from [bf1c21ba16]

Added ajax/README

Added ajax/cgi-bin/fossil-json.cgi.example

Added ajax/i-test/rhino-shell.js

Added ajax/i-test/rhino-test.js

Added ajax/index.html

Added ajax/js/fossil-ajaj.js

Added ajax/js/json2.js

Added ajax/js/whajaj.js

Added ajax/wiki-editor.html

Changes to auto.def

Added src/Makefile

Changes to src/blob.c

Changes to src/branch.c

Changes to src/captcha.c

Changes to src/cgi.c

Added src/cson_amalgamation.c

Added src/cson_amalgamation.h

Changes to src/db.c

Added src/json.c

Added src/json_artifact.c

Added src/json_branch.c

Added src/json_detail.h

Added src/json_diff.c

Added src/json_login.c

Added src/json_query.c

Added src/json_report.c

Added src/json_tag.c

Added src/json_timeline.c

Added src/json_user.c

Added src/json_wiki.c

Changes to src/login.c

Changes to src/main.c

Changes to src/main.mk

Changes to src/makemake.tcl

Changes to src/name.c

Changes to src/report.c

Changes to src/timeline.c

Changes to src/tkt.c

Changes to src/wiki.c

Changes to win/Makefile.dmc

Changes to win/Makefile.mingw

Changes to win/Makefile.msc