From: W. Trevor King <wking@tremily.us>
Date: Thu, 25 Apr 2013 12:48:22 +0000 (-0400)
Subject: Merge remote-tracking branch 'local/master'
X-Git-Tag: v1.0~289
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=08c1de678f294f4e97b84b3532e1e2dcd6bda16c;p=thesis.git

Merge remote-tracking branch 'local/master'

With thesis development distributed over a number of machines, I lost
track of a few repositories.  This pulls in some changes from a
recently rediscovered repo.

* local/master:
  Relabel src/unfolding/rate.tex as sec:unfolding-rate.
  Consolidate references to cantilever calibration summary as sec:cantilever-calib:intro.
  Remove cruft from SCons generator bodies.

Conflicts:
	src/apparatus/main.tex
	src/unfolding/rate.tex
---

08c1de678f294f4e97b84b3532e1e2dcd6bda16c
diff --cc src/apparatus/main.tex
index a54b74e,c87d3b8..f74772b
--- a/src/apparatus/main.tex
+++ b/src/apparatus/main.tex
@@@ -8,8 -8,9 +8,9 @@@ outline the procedure for synthesizing 
  (\cref{sec:polymer-synthesis}).  With the groundwork out of the way,
  we will look at sample preparation (\cref{sec:sample-preparation}) and
  the velocity clamp force spectroscopy procedure
 -(\cref{sec:procedure}).  Finally, we will give an executive summary of
 -cantilever calibration (\cref{sec:cantilever-calib:intro}) which is
 -discussed in more detail in \cref{sec:cantilever-calib}.
 +(\cref{sec:procedure}).  Finally, we will give a summary of cantilever
- calibration (\cref{sec:cantilever-calib:intro}).
++calibration (\cref{sec:cantilever-calib:intro}) which is discussed in
++more detail in \cref{sec:cantilever-calib}.
  
  Everything discussed in this chapter, with the possible exception of
  cantilever calibration, is fairly standard practice in the field of