summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--2020/info/29.md2
-rw-r--r--2020/schedule-details.txt2
-rw-r--r--2020/schedule.md2
-rw-r--r--2020/schedule/29.md2
-rw-r--r--2020/submissions.org10
5 files changed, 9 insertions, 9 deletions
diff --git a/2020/info/29.md b/2020/info/29.md
index 92451bd3..cfb7a67d 100644
--- a/2020/info/29.md
+++ b/2020/info/29.md
@@ -1,5 +1,5 @@
# Pathing of Least Resistance
-Corwin Brust
+Erik Elmshauser and Corwin Brust
We hope the dungeon-mode project will eventually support three primary
use-cases related to editing/designing, playing and running/hosting
diff --git a/2020/schedule-details.txt b/2020/schedule-details.txt
index 4fcae0f4..4e80a7ed 100644
--- a/2020/schedule-details.txt
+++ b/2020/schedule-details.txt
@@ -42,7 +42,7 @@
<tr><td width=100> 1:03 PM</td><td width=100> 1:13 PM</td><td><a href="/2020/schedule/26">Emacs as a Highschooler: How It Changed My Life</a></td><td>Pierce Wang</td></tr>
<tr><td width=100> 1:16 PM</td><td width=100> 1:26 PM</td><td><a href="/2020/schedule/27">State of Retro Gaming in Emacs</a></td><td>Vasilij "wasamasa" Schneidermann</td></tr>
<tr><td width=100> 1:29 PM</td><td width=100> 2:19 PM</td><td><a href="/2020/schedule/28">Welcome To The Dungeon</a></td><td>Erik Elmshauser and Corwin Brust</td></tr>
-<tr><td width=100> 2:22 PM</td><td width=100> 2:42 PM</td><td><a href="/2020/schedule/29">Pathing of Least Resistance</a></td><td>Corwin Brust</td></tr>
+<tr><td width=100> 2:22 PM</td><td width=100> 2:42 PM</td><td><a href="/2020/schedule/29">Pathing of Least Resistance</a></td><td>Erik Elmshauser and Corwin Brust</td></tr>
<tr><td width=100> 2:45 PM</td><td width=100> 2:55 PM</td><td><a href="/2020/schedule/30">A tour of vterm</a></td><td>Gabriele Bozzola (@sbozzolo)</td></tr>
<tr><td width=100> 2:58 PM</td><td width=100> 3:08 PM</td><td><a href="/2020/schedule/31">Lakota Language and Emacs</a></td><td>Grant Shangreaux</td></tr>
<tr><td width=100> 3:11 PM</td><td width=100> 3:31 PM</td><td><a href="/2020/schedule/32">Object Oriented Code in the Gnus Newsreader</a></td><td>Eric Abrahamsen</td></tr>
diff --git a/2020/schedule.md b/2020/schedule.md
index 409c5aab..ff90af3c 100644
--- a/2020/schedule.md
+++ b/2020/schedule.md
@@ -52,7 +52,7 @@ All the times below are given in EST time. You can check out the individual talk
<tr><td width=100> 1:03 PM</td><td width=100> 1:13 PM</td><td><a href="/2020/schedule/26">Emacs as a Highschooler: How It Changed My Life</a></td><td>Pierce Wang</td></tr>
<tr><td width=100> 1:16 PM</td><td width=100> 1:26 PM</td><td><a href="/2020/schedule/27">State of Retro Gaming in Emacs</a></td><td>Vasilij "wasamasa" Schneidermann</td></tr>
<tr><td width=100> 1:29 PM</td><td width=100> 2:19 PM</td><td><a href="/2020/schedule/28">Welcome To The Dungeon</a></td><td>Erik Elmshauser and Corwin Brust</td></tr>
-<tr><td width=100> 2:22 PM</td><td width=100> 2:42 PM</td><td><a href="/2020/schedule/29">Pathing of Least Resistance</a></td><td>Corwin Brust</td></tr>
+<tr><td width=100> 2:22 PM</td><td width=100> 2:42 PM</td><td><a href="/2020/schedule/29">Pathing of Least Resistance</a></td><td>Erik Elmshauser and Corwin Brust</td></tr>
<tr><td width=100> 2:45 PM</td><td width=100> 2:55 PM</td><td><a href="/2020/schedule/30">A tour of vterm</a></td><td>Gabriele Bozzola (@sbozzolo)</td></tr>
<tr><td width=100> 2:58 PM</td><td width=100> 3:08 PM</td><td><a href="/2020/schedule/31">Lakota Language and Emacs</a></td><td>Grant Shangreaux</td></tr>
<tr><td width=100> 3:11 PM</td><td width=100> 3:31 PM</td><td><a href="/2020/schedule/32">Object Oriented Code in the Gnus Newsreader</a></td><td>Eric Abrahamsen</td></tr>
diff --git a/2020/schedule/29.md b/2020/schedule/29.md
index f4723d5f..19dc6700 100644
--- a/2020/schedule/29.md
+++ b/2020/schedule/29.md
@@ -1,5 +1,5 @@
[[!meta title="Pathing of Least Resistance"]]
-[[!meta copyright="Copyright &copy; 2020 Corwin Brust"]]
+[[!meta copyright="Copyright &copy; 2020 Erik Elmshauser and Corwin Brust"]]
<!-- To edit the talk information, change /2020/info/TALKID.md. Boilerplate automatically generated from submissions.org using conf/generate-schedule-files --->
diff --git a/2020/submissions.org b/2020/submissions.org
index 0072bb86..d744e935 100644
--- a/2020/submissions.org
+++ b/2020/submissions.org
@@ -106,7 +106,7 @@ execute the buffer, update the talk's info/TALKID.md file.
| [2020-11-29 Sun 13:03-13:13] | Emacs as a Highschooler: How It Changed My Life | Pierce Wang | | Sun 12pm EST onwards |
| [2020-11-29 Sun 13:16-13:26] | State of Retro Gaming in Emacs | Vasilij "wasamasa" Schneidermann | | 8am-10pm CET, so 9am-3pm EST |
| [2020-11-29 Sun 13:29-14:19] | Welcome To The Dungeon | Erik Elmshauser and Corwin Brust | | ok |
-| [2020-11-29 Sun 14:22-14:42] | Pathing of Least Resistance | Corwin Brust | | ok |
+| [2020-11-29 Sun 14:22-14:42] | Pathing of Least Resistance | Erik Elmshauser and Corwin Brust | | ok |
| [2020-11-29 Sun 14:45-14:55] | A tour of vterm | Gabriele Bozzola (@sbozzolo) | planned | MST, so 11am-5pm EST |
| [2020-11-29 Sun 14:58-15:08] | Lakota Language and Emacs | Grant Shangreaux | planned | Central time, 10am EST-5pm EST |
| [2020-11-29 Sun 15:11-15:31] | Object Oriented Code in the Gnus Newsreader | Eric Abrahamsen | planned | ok |
@@ -150,7 +150,7 @@ execute the buffer, update the talk's info/TALKID.md file.
| | [2020-11-29 Sun 13:03-13:13] | Emacs as a Highschooler: How It Changed My Life | Pierce Wang |
| | [2020-11-29 Sun 13:16-13:26] | State of Retro Gaming in Emacs | Vasilij "wasamasa" Schneidermann |
| | [2020-11-29 Sun 13:29-14:19] | Welcome To The Dungeon | Erik Elmshauser and Corwin Brust |
-| | [2020-11-29 Sun 14:22-14:42] | Pathing of Least Resistance | Corwin Brust |
+| | [2020-11-29 Sun 14:22-14:42] | Pathing of Least Resistance | Erik Elmshauser and Corwin Brust |
| planned | [2020-11-29 Sun 14:45-14:55] | A tour of vterm | Gabriele Bozzola (@sbozzolo) |
| planned | [2020-11-29 Sun 14:58-15:08] | Lakota Language and Emacs | Grant Shangreaux |
| planned | [2020-11-29 Sun 15:11-15:31] | Object Oriented Code in the Gnus Newsreader | Eric Abrahamsen |
@@ -2192,7 +2192,7 @@ SCHEDULED: <2020-11-29 Sun 12:00-13:00>
| [2020-11-29 Sun 13:03-13:13] | Emacs as a Highschooler: How It Changed My Life | Pierce Wang | | Sun 12pm EST onwards |
| [2020-11-29 Sun 13:16-13:26] | State of Retro Gaming in Emacs | Vasilij "wasamasa" Schneidermann | | 8am-10pm CET, so 9am-3pm EST |
| [2020-11-29 Sun 13:29-14:19] | Welcome To The Dungeon | Erik Elmshauser and Corwin Brust | | ok |
-| [2020-11-29 Sun 14:22-14:42] | Pathing of Least Resistance | Corwin Brust | | ok |
+| [2020-11-29 Sun 14:22-14:42] | Pathing of Least Resistance | Erik Elmshauser and Corwin Brust | | ok |
| [2020-11-29 Sun 14:45-14:55] | A tour of vterm | Gabriele Bozzola (@sbozzolo) | planned | MST, so 11am-5pm EST |
| [2020-11-29 Sun 14:58-15:08] | Lakota Language and Emacs | Grant Shangreaux | planned | Central time, 10am EST-5pm EST |
| [2020-11-29 Sun 15:11-15:31] | Object Oriented Code in the Gnus Newsreader | Eric Abrahamsen | planned | ok |
@@ -2423,12 +2423,12 @@ SCHEDULED: <2020-11-29 Sun 14:22-14:42>
:MAX_TIME: 20
:MIN_TIME: 20
:AVAILABILITY: ok
-:NAME: Corwin Brust
+:NAME: Erik Elmshauser and Corwin Brust
:CUSTOM_ID: talk29
:TALK_ID: 29
:END:
-Name: Corwin Brust
+Name: Erik Elmshauser and Corwin Brust
***** Preferred format