Merge branch 'system-of-units' into parameters
authorLiam M. Healy <lhealy@common-lisp.net>
Sun, 26 May 2013 23:30:24 +0000 (19:30 -0400)
committerLiam M. Healy <lhealy@common-lisp.net>
Sun, 26 May 2013 23:30:24 +0000 (19:30 -0400)
commit1e45852be59be6d5657afde0c53045e42dea0554
tree4a780e385c17e40e4cbbbc0c904532d796c3cb0b
parent521ccc98875d927af6f8929992b957effd277e20
parentf5bd85bb6951a19c00928abcc963f5964438f11f
Merge branch 'system-of-units' into parameters

Conflicts:
documentation/antik.pdf
physical-quantities/units.lisp
documentation/antik.texi
documentation/antik/Parameters.html
physical-quantities/units.lisp