diff options
| author | Kostadin Damyanov <maxmight@gmail.com> | 2016-01-15 22:43:54 +0200 |
|---|---|---|
| committer | Kostadin Damyanov <maxmight@gmail.com> | 2016-01-15 22:43:54 +0200 |
| commit | 7998197ff17892a8127aa2fe53d13937763dee87 (patch) | |
| tree | 53c97bf9907a3225776340273e773a4d904cbb73 /platform/javascript/audio_server_javascript.cpp | |
| parent | 62574759ab16043b70f2da6e160072c353ba4148 (diff) | |
| parent | 3c6dd5749d445f082fc925a34cc0a26f8d342304 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'platform/javascript/audio_server_javascript.cpp')
| -rw-r--r-- | platform/javascript/audio_server_javascript.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/javascript/audio_server_javascript.cpp b/platform/javascript/audio_server_javascript.cpp index a2c6740eaf..fbd5d2e1c0 100644 --- a/platform/javascript/audio_server_javascript.cpp +++ b/platform/javascript/audio_server_javascript.cpp @@ -33,7 +33,7 @@ void AudioServerJavascript::sample_set_description(RID p_sample, const String& p } -String AudioServerJavascript::sample_get_description(RID p_sample, const String& p_description) const{ +String AudioServerJavascript::sample_get_description(RID p_sample) const{ return String(); } |