src/GAudioOutput.h · c9b53416d1810a9f3748dc5ad8db862d57097edf · Valentin Platzgummer / qgroundcontrol · GitLab

Blame History Permalink

Merge remote-tracking branch 'upstream/master' into espeak · 7f6db70d
Thomas Gubler authored Feb 17, 2014
```
Conflicts:
	QGCExternalLibs.pri
	src/GAudioOutput.cc
	src/GAudioOutput.h
```
7f6db70d

GAudioOutput.h 3.59 KB