Merge commit '87d364ffd932eb16a71371bdb1af5a68400bdc06'

lpj0017 · Feb 12, 2010 · cc1daa4 · cc1daa4
2 parents 5fd6249 + 87d364f
commit cc1daa4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/bin/code_swarm b/bin/code_swarm
@@ -153,7 +153,7 @@ def code_swarm_dir(repo):
 def autogenerate_files(options):
     """docstring for autogenerate_files"""
     if os.path.exists(".git"):
-        dir = code_swarm_dir(".git")
+        dir = code_swarm_dir("")
         generate_log = do_git
     elif os.path.exists(".svn"):
         dir = code_swarm_dir(".svn")

diff --git a/bin/code_swarm_video b/bin/code_swarm_video
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+date=`date +%d-%b-%Y`
+home=.code_swarm
+mencoder mf://$home/frames/*.png -mf fps=24:type=png -ovc lavc -oac copy -o $home/video-$date.avi