Merge remote branch 'drnic/master'

Conflicts: README.txt
schacon · Jun 11, 2010 · 781bc51 · 781bc51
2 parents 8a893f0 + 5f07ba5
commit 781bc51
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/README.rdoc b/README.rdoc
@@ -250,6 +250,11 @@ So far, ShowOff has been used in the following presentations:
 
 If you use it for something, please let me know so I can add it.
 
+= Editor Support
+
+* TextMate Bundle - Showoff.tmdbundle - Dr Nic Williams
+  http://github.com/drnic/Showoff.tmbundle
+
 = Future Plans
 
 I really want this to evolve into a dynamic presentation software server,