Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-19 22:35:12 +03:00
Code Issues 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
commit af4e1ce85a
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
radio/src/audio_arm.cpp
View file

@ -145,7 +145,11 @@ char * getAudioPath(char * path)
char * getSystemAudioPath(char * path)
{
char * str = getAudioPath(path);
<<<<<<< HEAD
strcpy(str, SYSTEM_SUBDIR "/");
=======
strcpy(path, SYSTEM_SUBDIR "/");
>>>>>>> 5f560e8d1b2815267f118be59c9269ed42357d66
return str + sizeof(SYSTEM_SUBDIR);
}