FS-6272 --resolve

Conflicts:
	src/include/switch_types.h
This commit is contained in:
Anthony Minessale
2014-02-27 03:24:25 +05:00
parent e8c163c1ee
commit a0ba6de40d
3 changed files with 9 additions and 5 deletions
+1
View File
@@ -1315,6 +1315,7 @@ typedef enum {
CF_NOVIDEO,
CF_VIDEO_ECHO,
CF_SLA_INTERCEPT,
CF_HANGUP_HELD,
/* WARNING: DO NOT ADD ANY FLAGS BELOW THIS LINE */
/* IF YOU ADD NEW ONES CHECK IF THEY SHOULD PERSIST OR ZERO THEM IN switch_core_session.c switch_core_session_request_xml() */
CF_FLAG_MAX