Changeset 295e5071 for doc/user

Timestamp:

Feb 1, 2018, 10:19:20 AM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

0992849

Parents:

e2e7330 (diff), 23c27039 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:/u/cforall/software/cfa/cfa-cc

Location:

doc/user

Files:

• Makefile (modified) (2 diffs)
• user.tex (modified) (1 diff)

doc/user/Makefile

@@ -9 +9 @@
 
 MAKEFLAGS = --no-print-directory --silent #
-VPATH = ${Figures}
+VPATH = ${Build} ${Figures}
 
 ## Define the text source files.
@@ -56 +56 @@
         dvips ${Build}/$< -o $@
 
-${basename ${DOCUMENT}}.dvi : Makefile ${Build} ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} ${basename ${DOCUMENT}}.tex \
+${basename ${DOCUMENT}}.dvi : Makefile ${Build} ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} \
                 ${Macros}/common.tex ${Macros}/lstlang.sty ${Macros}/indexstyle ../bibliography/pl.bib
         # Conditionally create an empty *.ind (index) file for inclusion until makeindex is run.

doc/user/user.tex

@@ -11 +11 @@
 %% Created On       : Wed Apr  6 14:53:29 2016
 %% Last Modified By : Peter A. Buhr
-%% Last Modified On : Wed Jan 31 07:59:24 2018
-%% Update Count     : 3146
+%% Last Modified On : Wed Jan 31 22:29:25 2018
+%% Update Count     : 3147
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%