Mercurial > cortex

comparison org/thesis.org @ 339:0efa36180e8a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge changes from laptop
author Robert McIntyre <rlm@mit.edu>
date Sat, 21 Jul 2012 10:03:02 -0500
parents f4ef73370da1
children dc8de16d0051
comparison
equal deleted inserted replaced
338:d37ccb6c888f 339:0efa36180e8a
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 =======
8 * COMMENT Multiple senses are compelling for AI. 11 * COMMENT Multiple senses are compelling for AI.
9 #+include: "./intro.org" 12 #+include: "./intro.org"
10 13
11 * Virtual reality is vastly easier than actual reality. 14 * Virtual reality is vastly easier than actual reality.
12 15
52 55
53 * Swarm Creatures 56 * Swarm Creatures
54 57
55 * Simulated Imagination 58 * Simulated Imagination
56 59
60 >>>>>>> other