10 Commits (94607bbdead788c2e0dd0d5429bb228c41e131b7)
 

Author SHA1 Message Date
Jonathan Hodgson 94607bbdea Hard wraps long lines to 100 chars 5 years ago
Jonathan Hodgson 55537e9488 Adds .tmp to gitignore 5 years ago
Jonathan Hodgson 1df85219c9 Write slides about merge with conflict 5 years ago
Jonathan Hodgson c6c938207f Adds references and branches slides 5 years ago
Jonathan Hodgson 22ef5f581d A lot of work on the presentation 5 years ago
Jonathan Hodgson 63c02e13f9 Modifies makefile 5 years ago
Jonathan Hodgson 526bafc972 Adds Readme 5 years ago
Jonathan Hodgson 2712cddb60 More work on presentation + improves auto images 5 years ago
Jonathan Hodgson b128151e39 Starts presentation 5 years ago
Jonathan Hodgson d3db0dd7eb This is not the commit message you are looking for 5 years ago