src/GAudioOutput.h · 43f4c3708e509e6172dc0d0ff5ba5b8d8dc44419 · Valentin Platzgummer / qgroundcontrol · GitLab

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