Merge branch 'util/safe-strto' into phys305/gaussian-bump
authorW. Trevor King <wking@tremily.us>
Tue, 12 Feb 2013 18:13:53 +0000 (13:13 -0500)
committerW. Trevor King <wking@tremily.us>
Tue, 12 Feb 2013 18:13:53 +0000 (13:13 -0500)
commit858864bd994ae3fd8ff0e21cf72d2105b8df5974
tree1ad54d54ae8dff6331ce9bd79c083887f90043e0
parentf693761d43f9be3d53ab1f60f7488e15152237de
parentcb3fafd0938b6b2b101704b201577122de34fb1a
Merge branch 'util/safe-strto' into phys305/gaussian-bump

Conflicts:
Makefile  (add safe-strto dependencies for one_gaussian_bump)
Makefile