summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2010-01-19 15:09:55 +1300
committerKeith Packard <keithp@keithp.com>2010-01-19 15:09:55 +1300
commitacd9a32f73504c31e71379c7b77e9e078d05f2ef (patch)
tree7d844d22617ecf607585ba5674f8d5b68cc0d0da
parent16cdf099a776b238f32517e9bdb5a4f5dfec2697 (diff)
parent2aa8949e22286ed00cc61d7c077aeee88f3c4750 (diff)
Merge remote branch 'origin/master'
-rw-r--r--talks/TM-v0.2-LCA2010.odpbin52413071 -> 52712988 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/talks/TM-v0.2-LCA2010.odp b/talks/TM-v0.2-LCA2010.odp
index 9165124..4727188 100644
--- a/talks/TM-v0.2-LCA2010.odp
+++ b/talks/TM-v0.2-LCA2010.odp
Binary files differ