Merge branch 'master' of

git@git.metabarcoding.org:obitools/obitools3.git

Conflicts:
	doc/source/formats.rst
	src/obicolumn.h
This commit is contained in:
2015-05-23 10:23:33 +03:00
11 changed files with 293 additions and 86 deletions

View File

@@ -98,7 +98,7 @@ or more (if there are several versions), and that there is one file per version.
Versioning
----------
The first version of a column file is numbered 1, and each new version increments that
The first version of a column file is numbered 0, and each new version increments that
number by 1.
The number of the latest version of an OBIDMS column is stored in an `OBIDMS release file <formats.html#obidms-release-files>`_.
@@ -133,13 +133,17 @@ OBIDMS history file
An OBIDMS history file consists of an ordered list of views and commands, those commands leading
from one view to the next one.
This history can be represented in the form of a --- showing all the
This history can be represented in the form of a ?? showing all the
operations ever done in the OBIDMS directory and the views in between them :
.. image:: ./images/history.png
:width: 150 px
:align: center
OBIType header file
========================
.. doxygenfile:: obitypes.h
OBIIntColumn header file