[asterisk-commits] qwell: branch qwell/fun_with_transports r387998 - in /team/qwell/fun_with_tra...

[SVN commits to the Asterisk project]

Author: qwell
Date: Wed May  8 12:33:30 2013
New Revision: 387998

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=387998
Log:
Add version.c to list of ignored files in the utils directory.
........

Merged revisions 387974 from file:///srv/subversion/repos/asterisk/trunk
........

Merged revisions 387978 from http://svn.asterisk.org/svn/asterisk/team/group/pimp_my_sip

Modified:
    team/qwell/fun_with_transports/   (props changed)
    team/qwell/fun_with_transports/utils/   (props changed)

Propchange: team/qwell/fun_with_transports/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/qwell/fun_with_transports/
------------------------------------------------------------------------------
--- pimp_my_sip-integrated (original)
+++ pimp_my_sip-integrated Wed May  8 12:33:30 2013
@@ -1,1 +1,1 @@
-/team/group/pimp_my_sip:1-387956
+/team/group/pimp_my_sip:1-387997

Propchange: team/qwell/fun_with_transports/utils/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed May  8 12:33:30 2013
@@ -32,6 +32,7 @@
 strings.c
 threadstorage.c
 utils.c
+version.c
 astcanary
 refcounter
 *.gcno