]> git.parisson.com Git - timeside-diadems.git/commit
projects / timeside-diadems.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a1cb5db ac86146)
Merge branch 'master' into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 11 Jul 2014 10:05:53 +0000 (12:05 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 11 Jul 2014 10:05:53 +0000 (12:05 +0200)
commit4c7c42cb684d2992790391425b9a51f225582c50
tree3f86dfc310d88a16f256cdd6c8c92c379966c2ectree | snapshot
parenta1cb5dba3e02beab86c40c798a0d1c88142a9e2fcommit | diff
parentac86146bac2c8a441df1167defd620833194d8e4commit | diff
Merge branch 'master' into dev

Conflicts:
README.rst
setup.py
timeside/__init__.py
README.rst diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.