]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3062fc8 f9ee20a)
Merge branch 'dev'
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 19 Dec 2013 10:42:21 +0000 (11:42 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 19 Dec 2013 10:42:21 +0000 (11:42 +0100)
Conflicts:
tools/scripts/transcode/transcode.py


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