]> git.parisson.com Git - telecaster-client.git/commitdiff
projects / telecaster-client.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a06f2eb 3052fdd)
Merge branch 'dev'
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 15 Apr 2015 09:18:30 +0000 (11:18 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 15 Apr 2015 09:18:30 +0000 (11:18 +0200)
Conflicts:
telecaster/tools/status.py


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