Mercurial > cortex

changeset 570:9647f0168287

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update for interview.
author Robert McIntyre <rlm@mit.edu>
date Tue, 15 Jul 2014 02:46:00 -0400
parents 1943a5313f40
children 819968c8a391
files org/genesis_demonstration.clj thesis/org/roadmap.org
diffstat 2 files changed, 8 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
     1.1 --- a/org/genesis_demonstration.clj	Mon Jun 16 11:26:41 2014 -0400
     1.2 +++ b/org/genesis_demonstration.clj	Tue Jul 15 02:46:00 2014 -0400
     1.3 @@ -62,5 +62,9 @@
     1.4  (learn-and-view-touch-regions)
     1.5  
     1.6  
     1.7 +;; pokemon yellow total control hack
     1.8 +(play "/home/r/proj/vba-clojure/video/total-control.mp4")
     1.9  
    1.10 -)
    1.11 \ No newline at end of file
    1.12 +
    1.13 +
    1.14 +)

     2.1 --- a/thesis/org/roadmap.org	Mon Jun 16 11:26:41 2014 -0400
     2.2 +++ b/thesis/org/roadmap.org	Tue Jul 15 02:46:00 2014 -0400
     2.3 @@ -20,8 +20,9 @@
     2.4    - implement stretch goals from Winston if possible
     2.5    - complete final formatting and submit
     2.6  
     2.7 -* DONE Turn in CORTEX
     2.8 -  CLOSED: [2014-05-22 Thu 12:01] DEADLINE: <2014-05-12 Mon>
     2.9 +<<<<<<< local
    2.10 +* DONE CORTEX
    2.11 +  CLOSED: [2014-05-29 Thu 17:01] DEADLINE: <2014-05-09 Fri>
    2.12    SHIT THAT'S IN 67 DAYS!!!
    2.13  
    2.14  ** program simple feature matching code for the worm's segments