Merge branch 'v1.2.stable' of ssh://git.freeswitch.org:222/freeswitch into v1.2.stable

2013-12-10 12:15:29 -05:00 · 2013-12-10 12:15:29 -05:00 · fa43a37a82
parent 5459d37f64 b1288520bc
commit fa43a37a82
7 changed files with 3 additions and 8 deletions
--- a/debian/AUTHORS
+++ b/debian/AUTHORS
@ -23,4 +23,3 @@ Thanks-to: Steven Ayre <steveayre@gmail.com>

 Thanks-to: William King <william.king@quentustech.com>
 # for moral support and small tweaks
-
--- a/debian/control-modules
+++ b/debian/control-modules
@ -696,4 +696,3 @@ Description: mod_xml_rpc
 Module: xml_int/mod_xml_scgi
 Description: mod_xml_scgi
 Adds mod_xml_scgi.
-
--- a/debian/freeswitch-systemd.freeswitch.service
+++ b/debian/freeswitch-systemd.freeswitch.service
@ -32,4 +32,3 @@ UMask=0007

 [Install]
 WantedBy=multi-user.target
-
--- a/debian/rules
+++ b/debian/rules
@ -133,4 +133,3 @@ binary-quicktest:
 	echo "applications/mod_commands" > debian/modules.conf
 	(cd debian && ./bootstrap.sh)
 	dh binary
-
--- a/debian/util.sh
+++ b/debian/util.sh
@ -455,4 +455,3 @@ case "$cmd" in
  create-orig) create_orig "$@" ;;
  *) usage ;;
 esac
-