commit 8af73cb70489cb16c28e4f698325ce6a104aa19c
author Alexandre Lision <alexandre.lision@savoirfairelinux.com> Tue Dec 10 14:11:20 2013 -0500
committer Alexandre Lision <alexandre.lision@savoirfairelinux.com> Tue Dec 10 14:11:20 2013 -0500
tree b34af47cb47f01532d4ee50b3e1125521ed5dd60
parent 47a7204426cf005d5ab322bc8375c315e7488cff

* #36737: switch back to svn repo, remove assert in sip_transaction.c

jni/pjproject-android/.svn/pristine/05/05e3d093260ca88f8e2afdec338efb23e09e1982.svn-base

diff --git a/jni/pjproject-android/.svn/pristine/05/05e3d093260ca88f8e2afdec338efb23e09e1982.svn-base b/jni/pjproject-android/.svn/pristine/05/05e3d093260ca88f8e2afdec338efb23e09e1982.svn-base
new file mode 100644
index 0000000..634fb6a
--- /dev/null
+++ b/jni/pjproject-android/.svn/pristine/05/05e3d093260ca88f8e2afdec338efb23e09e1982.svn-base
@@ -0,0 +1,7 @@
+#ifndef RESAMPLE_HAS_SMALL_FILTER
+#   define RESAMPLE_HAS_SMALL_FILTER	1
+#endif
+
+#ifndef RESAMPLE_HAS_LARGE_FILTER
+#   define RESAMPLE_HAS_LARGE_FILTER	1
+#endif