Mike Hearn b8a50a65cf Merge branch 'finish-timestamping' ...

# Conflicts:
#	docs/build/html/searchindex.js
#	src/core/serialization/Kryo.kt

2015-11-30 16:35:10 +00:00

..

build/html

Merge branch 'finish-timestamping'

2015-11-30 16:35:10 +00:00

source

Merge branch 'finish-timestamping'

2015-11-30 16:35:10 +00:00

Makefile

Introduce documentation of the current prototype with a contract programming tutorial (incomplete), using the Sphinx docs engine.

2015-11-25 18:01:37 +01:00