Commit Graph

6 Commits

Author SHA1 Message Date
Robin Clark
f726db842e Merge branch 'master' of dev:/home/robin/git/thesis
Conflicts:
	submission_thesis/colophon/copy.tex
2013-08-25 12:21:54 +01:00
Robin Clark
9ff1ed0c16 colophon hgas potential merge conflict with something done at work 2013-08-25 11:38:32 +01:00
4bc631a54b tunbridge wells juggling club 2013-08-21 18:19:37 +01:00
03b5905ff1 fiddling with the thanks bit 2013-08-21 13:54:14 +01:00
Robin Clark
ccf1df0ad4 colophon mark I 2013-08-18 21:14:53 +01:00
Robin Clark
53efa94140 another typo 2013-08-18 20:30:53 +01:00