[asterisk-commits] qwell: branch 1.8 r336591 - in /branches/1.8: ./ cel/ configs/ contrib/realti...

[SVN commits to the Asterisk project]

Author: qwell
Date: Mon Sep 19 11:21:03 2011
New Revision: 336591

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=336591
Log:
Remove weird mergeinfo props that make merges annoying sometimes.

Modified:
    branches/1.8/   (props changed)
    branches/1.8/cel/cel_odbc.c   (props changed)
    branches/1.8/configs/cel_odbc.conf.sample   (props changed)
    branches/1.8/contrib/realtime/mysql/iaxfriends.sql   (props changed)
    branches/1.8/contrib/realtime/mysql/meetme.sql   (props changed)
    branches/1.8/contrib/realtime/mysql/sipfriends.sql   (props changed)
    branches/1.8/contrib/realtime/mysql/voicemail.sql   (props changed)
    branches/1.8/contrib/realtime/postgresql/realtime.sql   (props changed)
    branches/1.8/sounds/Makefile   (props changed)

Propchange: branches/1.8/
            ('svn:mergeinfo' removed)

Propchange: branches/1.8/cel/cel_odbc.c
            ('svn:mergeinfo' removed)

Propchange: branches/1.8/configs/cel_odbc.conf.sample
            ('svn:mergeinfo' removed)

Propchange: branches/1.8/contrib/realtime/mysql/iaxfriends.sql
            ('svn:mergeinfo' removed)

Propchange: branches/1.8/contrib/realtime/mysql/meetme.sql
            ('svn:mergeinfo' removed)

Propchange: branches/1.8/contrib/realtime/mysql/sipfriends.sql
            ('svn:mergeinfo' removed)

Propchange: branches/1.8/contrib/realtime/mysql/voicemail.sql
            ('svn:mergeinfo' removed)

Propchange: branches/1.8/contrib/realtime/postgresql/realtime.sql
            ('svn:mergeinfo' removed)

Propchange: branches/1.8/sounds/Makefile
            ('svn:mergeinfo' removed)