piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bsongis/Issue713_more_custom_functions' of

Browse Source 
https://github.com/opentx/opentx into
bsongis/Issue713_more_custom_functions

Conflicts:
	radio/src/audio_arm.cpp
This commit is contained in:
Bertrand Songis
2014-02-21 16:45:58 +01:00
parent 0345173039 5f560e8d1b
commit af4e1ce85a
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/audio_arm.cpp
+4
View File
@@ -145,7 +145,11 @@ char * getAudioPath(char * path)
char * getSystemAudioPath(char * path) char * getSystemAudioPath(char * path)
{ {
char * str = getAudioPath(path); char * str = getAudioPath(path);
<<<<<<< HEAD
strcpy(str, SYSTEM_SUBDIR "/"); strcpy(str, SYSTEM_SUBDIR "/");
=======
strcpy(path, SYSTEM_SUBDIR "/");
>>>>>>> 5f560e8d1b2815267f118be59c9269ed42357d66
return str + sizeof(SYSTEM_SUBDIR); return str + sizeof(SYSTEM_SUBDIR);
} }