Merge branch 'master' of goat:git/laserbrain_demo
authorJohn Tsiombikas <nuclear@member.fsf.org>
Sat, 29 Sep 2018 03:05:06 +0000 (06:05 +0300)
committerJohn Tsiombikas <nuclear@member.fsf.org>
Sat, 29 Sep 2018 03:05:06 +0000 (06:05 +0300)
1  2 
src/app.cc

diff --cc src/app.cc
Simple merge