]> git.parisson.com Git - telecaster-client.git/commitdiff
projects / telecaster-client.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 311f1d1 e9d3065)
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)
Conflicts:
conf/home/fluxbox/telecaster/tc_video_only_simple_webm.sh


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.