Commit graph

3 commits

Author SHA1 Message Date
Philip Rosedale
ad8246a0f5 Turned log off by default 2013-05-22 13:46:39 -07:00
tosh
bfaeb4a4d9 Merge branch 'master' of git://github.com/worklist/hifi
Conflicts:
	libraries/avatars/src/AvatarData.cpp
2013-05-21 18:46:20 +02:00
tosh
a86b8a1d93 refactors logging 2013-05-21 01:00:10 +02:00