]> git.parisson.com Git - telecaster-client.git/commit
Merge branch 'master' into fulljs
authoryomguy <yomguy@parisson.com>
Fri, 9 Mar 2012 15:39:20 +0000 (16:39 +0100)
committeryomguy <yomguy@parisson.com>
Fri, 9 Mar 2012 15:39:20 +0000 (16:39 +0100)
commitc984bf24c8fdce26838c2fd73e27bba1fa80f29e
treedb281fbfb843eaa2d4009143b899fb4e7596dd0d
parent311f1d145ae7d08f7f69dc83c9a5631d901b5127
parente9d3065383f5c8fbeed5fcc4810e4b025951579b
Merge branch 'master' into fulljs

Conflicts:
conf/home/fluxbox/telecaster/tc_video_only_simple_webm.sh