tree 0bacebfdf2c7feb2f1f657ff303a9eb744750aca
parent e6e787959f51f280a78a2dc7bd7d1c16b11f8fa9
parent 0945cc5512e52f9a18770f1eea0dfb0bb1dfb2a4
author Piotr Krysik <ptrkrysik@gmail.com> 1505287912 +0200
committer Piotr Krysik <ptrkrysik@gmail.com> 1505287912 +0200

Merge branch 'development' into ptrkrysik/trx

# Conflicts:
#	lib/CMakeLists.txt