Mercurial > cortex

comparison org/thesis.org @ 342:dc8de16d0051

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve thesis.org
author Robert McIntyre <rlm@mit.edu>
date Sat, 21 Jul 2012 23:39:05 -0500
parents 0efa36180e8a
children
comparison
equal deleted inserted replaced
341:2e7d786241d3 342:dc8de16d0051
3 #+email: rlm@mit.edu 3 #+email: rlm@mit.edu
4 #+description: MEng thesis for Robert McIntyre 4 #+description: MEng thesis for Robert McIntyre
5 #+keywords: AI, simulation, jMonkeyEngine3, clojure, virtual reality 5 #+keywords: AI, simulation, jMonkeyEngine3, clojure, virtual reality
6 #+SETUPFILE: ../../aurellem/org/setup.org 6 #+SETUPFILE: ../../aurellem/org/setup.org
7 7
8 <<<<<<< local
9 *
10 =======
11 * COMMENT Multiple senses are compelling for AI. 8 * COMMENT Multiple senses are compelling for AI.
12 #+include: "./intro.org" 9 #+include: "./intro.org"
13 10
14 * Virtual reality is vastly easier than actual reality. 11 * Virtual reality is vastly easier than actual reality.
15 12
55 52
56 * Swarm Creatures 53 * Swarm Creatures
57 54
58 * Simulated Imagination 55 * Simulated Imagination
59 56
60 >>>>>>> other 57