Merge branch 'master' into chuck-implementation
authorVasilij Schneidermann <v.schneidermann@gmail.com>
Sat, 6 Aug 2016 21:56:29 +0000 (23:56 +0200)
committerVasilij Schneidermann <v.schneidermann@gmail.com>
Sat, 6 Aug 2016 21:56:29 +0000 (23:56 +0200)
commit5d47a419a7de78838f941f296b523d8299e3267a
treea29f9494b53b4f9dc3d52eba1348ab0b6395fc8d
parent35163c1b322c24ae2b9d4b7752f9e96cc1add945
parenta3a6f6809815efe921b571c11f34dfd7d088d811
Merge branch 'master' into chuck-implementation
Makefile