Merge branch 'master' of goat:git/laserbrain_demo
authorJohn Tsiombikas <nuclear@member.fsf.org>
Sat, 16 Sep 2017 06:55:20 +0000 (09:55 +0300)
committerJohn Tsiombikas <nuclear@member.fsf.org>
Sat, 16 Sep 2017 06:55:20 +0000 (09:55 +0300)
commit05fbfb6f2570953f8e98d99e58c7c763a0279c21
tree2eb8f678f44851362655e3cb4f06820a4275031f
parentb6285d483c8b55a52b6965271a3d3163b2e2f8fa
parent5b259c6064e9443d84f7a1154f8e02da444fb1c8
Merge branch 'master' of goat:git/laserbrain_demo
src/app.cc
src/avatar.h