summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorP. J. McDermott <pjm@nac.net>2011-11-15 00:21:41 (EST)
committer P. J. McDermott <pjm@nac.net>2011-11-15 00:21:41 (EST)
commit467c1ad34a2914351a5f7c93348d64c08a670262 (patch)
tree05a9b774eab53556f2a5960356915bf86aa51ffe
parent7f29f0a627994d3ba2c7569282ce128e1f134923 (diff)
downloadfs-os-talk-467c1ad34a2914351a5f7c93348d64c08a670262.zip
fs-os-talk-467c1ad34a2914351a5f7c93348d64c08a670262.tar.gz
fs-os-talk-467c1ad34a2914351a5f7c93348d64c08a670262.tar.bz2
Add time estimates.
-rw-r--r--researched-outline.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/researched-outline.txt b/researched-outline.txt
index ed58375..9d83c09 100644
--- a/researched-outline.txt
+++ b/researched-outline.txt
@@ -1,7 +1,7 @@
working title:
History of Software Freedom: Free Software and Open Source
-hacker subculture
+hacker subculture - ~04:00
will discuss first, since:
hacker values permeate and give context to the history of sw freedom
few, if any, in the audience know what a hacker is
@@ -103,7 +103,7 @@ in the beginning, there was freedom - ~02:00
[DMR-Hist]
[ESR-TAOUP-2.1]
[WP-Unix]
-proprietarization
+proprietarization - ~02:00
IBM unbundling
1969
IBM stopped providing software in source form with hardware