From: Christiaan Baaij <christiaan.baaij@gmail.com>
Date: Mon, 31 Aug 2009 12:43:17 +0000 (+0200)
Subject: Merge branch 'haskel09talk' of http://git.stderr.nl/matthijs/projects/master-project
X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fmaster-project%2Fhaskell-symposium-talk.git;a=commitdiff_plain;h=bb178ef5c75d6adf38295303902670365634319c;hp=-c

Merge branch 'haskel09talk' of git.stderr.nl/matthijs/projects/master-project

* 'haskel09talk' of http://git.stderr.nl/matthijs/projects/master-project:
  Improve presentation, based on comments.
  Rename summery to summary.
---

bb178ef5c75d6adf38295303902670365634319c
diff --combined Makefile
index 80ab266,66558e5..b03942e
--- a/Makefile
+++ b/Makefile
@@@ -10,7 -10,7 +10,7 @@@ LHSRCS = 
  	reducer.lhs \
  	howdoesitwork.lhs \
  	demo.lhs \
- 	summery.lhs
+ 	summary.lhs
  
  LHFORMATS = \
  	talk.fmt
@@@ -19,10 -19,7 +19,10 @@@ TEXSRCS = 
    preamble.tex
  
  SVGFIGURES = \
 -  mealymachine.svg
 +  mealymachine.svg \
 +  mealymachine2.svg \
 +  simpleCPU.svg \
 +  reducer.svg
  
  default: clash-haskell09
  
@@@ -48,4 -45,4 +48,4 @@@ clean
  		$(RM) $(FILE).synctex.gz
  		$(RM) $(FILE).nav
  		$(RM) $(FILE).snm
- 		$(RM) *.hi *.o *.aux
+ 		$(RM) *.hi *.o *.aux