Merge master.
authorCarl Hetherington <cth@carlh.net>
Thu, 17 Jul 2014 09:45:16 +0000 (10:45 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 17 Jul 2014 09:45:16 +0000 (10:45 +0100)
commitd2137ac5db409e686b4d9b3fa567935a5e416d41
treef4430ede9d6975ab9a4d21d6b546c8392f10ff67
parent40b654453c2ce0b266f43c36f1b9a5d1705f983c
parentd12a848916fb4fab0d1a14c6e72cfc0c8139255a
Merge master.
ChangeLog
src/lib/cross.cc