Merge branch 'master' of git@github.com:fluffymormegil/libmormegil
authorMartin Read <mpread@chiark.greenend.org.uk>
Wed, 6 Apr 2011 18:29:54 +0000 (19:29 +0100)
committerMartin Read <mpread@chiark.greenend.org.uk>
Wed, 6 Apr 2011 18:29:54 +0000 (19:29 +0100)
commit27f327bcc222ce0d52bc31f19766d37f1a95deac
treeeaecde55f73618afea666c7c9410466a7ed77bfb
parentdc2325f19ff8b6904a3e654e0cf65abf22fe6e7d
parentb609dab9da663d37dc8007036f83f9736206a0c9
Merge branch 'master' of git@github.com:fluffymormegil/libmormegil

Conflicts:

Makefile
include/libmormegil/mathops.hh
include/libmormegil/stlprintf.hh
include/libmormegil/Coord.hh
include/libmormegil/abs.hh
include/libmormegil/stlprintf.hh