]> git.parisson.com Git - timeside.git/commitdiff
projects / timeside.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3e638e2 d92efec)
Merge branch 'parameters_with_traits' into dev
authorThomas Fillon <thomas@parisson.com>
Thu, 17 Jul 2014 12:34:06 +0000 (14:34 +0200)
committerThomas Fillon <thomas@parisson.com>
Thu, 17 Jul 2014 12:34:06 +0000 (14:34 +0200)

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