Merge branch 'master' into apple_store

This commit is contained in:
Guillaume BIENKOWSKI 2014-07-08 10:50:14 +02:00
commit 9625d72a71

View file

@ -5497,7 +5497,6 @@
GCC_PREFIX_HEADER = linphone_Prefix.pch;
GCC_PREPROCESSOR_DEFINITIONS = (
VIDEO_ENABLED,
HAVE_OPENH264,
HAVE_SILK,
HAVE_SSL,
);
@ -5728,7 +5727,6 @@
GCC_PREFIX_HEADER = linphone_Prefix.pch;
GCC_PREPROCESSOR_DEFINITIONS = (
VIDEO_ENABLED,
HAVE_X264,
HAVE_SILK,
HAVE_SSL,
);
@ -5797,7 +5795,6 @@
GCC_PREFIX_HEADER = linphone_Prefix.pch;
GCC_PREPROCESSOR_DEFINITIONS = (
VIDEO_ENABLED,
HAVE_X264,
HAVE_SILK,
HAVE_SSL,
);