From: W. Trevor King <wking@tremily.us>
Date: Tue, 12 Feb 2013 18:13:53 +0000 (-0500)
Subject: Merge branch 'util/safe-strto' into phys305/gaussian-bump
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=858864bd994ae3fd8ff0e21cf72d2105b8df5974;p=assignment-template.git

Merge branch 'util/safe-strto' into phys305/gaussian-bump

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

858864bd994ae3fd8ff0e21cf72d2105b8df5974
diff --cc Makefile
index 97c4ac9,3a4d753..d66f5f8
--- a/Makefile
+++ b/Makefile
@@@ -64,6 -64,10 +64,10 @@@ TAR = ta
  #   http://www.gnu.org/software/make/manual/html_node/Rules.html
  all: $(PROGRAMS)
  
+ # Dependency declarations
 -safe-strto-example_OBJECTS = safe-strto-example.o safe-strto.o
 -safe-strto-example.o safe-strto.o: config.h safe-strto.h
++one_gaussian_bump_OBJECTS = one_gaussian_bump.o safe-strto.o
++one_gaussian_bump.o safe-strto.o: config.h safe-strto.h
+ 
  # target: help - display callable targets
  # Use `grep` to search this file for target comments
  help: