Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-05 04:41:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte/libraries
History
tosh 06288e8366 Merge branch 'master' of git://github.com/worklist/hifi 
Conflicts:
	interface/src/Oscilloscope.cpp
2013-05-20 23:15:06 +02:00
..
audio use AgentList defaults when AIM has no socket or address set 2013-05-20 11:48:50 -07:00
avatars resolve conflicts on merge with upstream master 2013-05-20 12:49:49 -07:00
shared Merge branch 'master' of git://github.com/worklist/hifi 2013-05-20 23:15:06 +02:00
voxels Tabs -> spaces, spacing fix. 2013-05-20 09:38:01 -07:00