Fossil

Check-in [ea7f3297]
Login

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

Overview
Comment:Merge from trunk.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | jan-manifest-tags
Files: files | file ages | folders
SHA1:ea7f3297046747a1ba92630cdd75304e854d594f
User & Date: jan 2016-02-04 15:22:39
Context
2016-02-04
16:06
Fix a minor preprocessor directive typo. Closed-Leaf check-in: 4fae98e7 user: jan tags: jan-manifest-tags
15:22
Merge from trunk. check-in: ea7f3297 user: jan tags: jan-manifest-tags
2016-02-01
20:38
Add --https and --nossl options to the 'server' command. check-in: b8c7af5b user: mistachkin tags: trunk
2016-01-07
10:02
Merge trunk. check-in: 99f7662b user: jan tags: jan-manifest-tags
Changes
Unified Diffs Side-by-Side Diffs Patch

Changes to Makefile.in.

Changes to auto.def.

Changes to autosetup/autosetup.

Changes to autosetup/system.tcl.

Changes to src/cache.c.

Changes to src/checkin.c.

Changes to src/content.c.

Changes to src/json_detail.h.

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/printf.c.

Changes to src/shell.c.

Changes to src/sqlcmd.c.

Changes to src/sqlite3.c.

Changes to src/sqlite3.h.

Changes to src/statrep.c.

Changes to src/th.c.

Changes to src/th.h.

Changes to src/th_lang.c.

Changes to src/th_main.c.

Changes to src/timeline.c.

Changes to src/xfer.c.

Changes to src/zip.c.

Changes to test/amend.test.

Changes to test/file1.test.

Changes to test/merge5.test.

Changes to test/merge6.test.

Changes to test/merge_renames.test.

Changes to test/revert.test.

Changes to test/tester.tcl.

Changes to test/th1-docs.test.

Changes to test/th1-hooks.test.

Changes to test/th1-tcl.test.

Changes to test/th1.test.

Changes to test/utf.test.

Changes to win/Makefile.mingw.

Changes to win/Makefile.mingw.mistachkin.

Changes to win/Makefile.msc.

Changes to win/buildmsvc.bat.

Changes to www/build.wiki.

Changes to www/changes.wiki.

Changes to www/th1.md.