Timestamp:
05/19/12 20:09:06 (12 months ago)
Author:
Michael Medin <michael@…>
Branches:
master, 0.4.1, 0.4.2
Children:
465866c
Parents:
af05fa1 (diff), 81dbd0c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' into 0.4.1

Conflicts:

changelog
version.hpp
version.txt

File:
1 added

Note: See TracChangeset for help on using the changeset viewer.