aboutsummaryrefslogtreecommitdiffstats
path: root/channels/chan_oss.c
diff options
context:
space:
mode:
authorkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2008-11-26 20:21:04 +0000
committerkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2008-11-26 20:21:04 +0000
commite27acaa5de2958e98e05ddb82231231b73882945 (patch)
treeb97c44c064235dd00c5622fa3fafffee52c5c5f5 /channels/chan_oss.c
parente60bada432f9aa4af545117c3f2fa95ef5be21a0 (diff)
rename these files so as to avoid conflicts when users update their working copies and have unversioned files already in place
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@159571 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_oss.c')
-rw-r--r--channels/chan_oss.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/channels/chan_oss.c b/channels/chan_oss.c
index a4f373ad9..ac62f2005 100644
--- a/channels/chan_oss.c
+++ b/channels/chan_oss.c
@@ -77,8 +77,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/musiconhold.h"
/* ringtones we use */
-#include "busy.h"
-#include "ringtone.h"
+#include "busy_tone.h"
+#include "ring_tone.h"
#include "ring10.h"
#include "answer.h"