[asterisk-commits] qwell: trunk r336600 - in /trunk: cel/ configs/ sounds/

[SVN commits to the Asterisk project]

Author: qwell
Date: Mon Sep 19 11:22:52 2011
New Revision: 336600

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

Modified:
    trunk/cel/cel_odbc.c   (props changed)
    trunk/configs/cel_odbc.conf.sample   (props changed)
    trunk/sounds/Makefile   (props changed)

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

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

Propchange: trunk/sounds/Makefile
            ('svn:mergeinfo' removed)