diff options
| author | Piotr Krysik <ptrkrysik@gmail.com> | 2017-09-13 09:31:52 +0200 |
|---|---|---|
| committer | Piotr Krysik <ptrkrysik@gmail.com> | 2017-09-13 09:31:52 +0200 |
| commit | 3148ff80cefb2023857a97a283dad8878a88d00c (patch) | |
| tree | 0bacebfdf2c7feb2f1f657ff303a9eb744750aca /LICENSE | |
| parent | e6e787959f51f280a78a2dc7bd7d1c16b11f8fa9 (diff) | |
| parent | 0945cc5512e52f9a18770f1eea0dfb0bb1dfb2a4 (diff) | |
Merge branch 'development' into ptrkrysik/trx
# Conflicts:
# lib/CMakeLists.txt
Diffstat (limited to 'LICENSE')
0 files changed, 0 insertions, 0 deletions