[asterisk-commits] lmadsen: branch 1.6.0 r167664 - in /branches/1.6.0: ./ contrib/scripts/

[SVN commits to the Asterisk project]

Author: lmadsen
Date: Thu Jan  8 08:31:37 2009
New Revision: 167664

URL: http://svn.digium.com/view/asterisk?view=rev&rev=167664
Log:
Merged revisions 167662 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r167662 | lmadsen | 2009-01-08 09:27:53 -0500 (Thu, 08 Jan 2009) | 1 line
  
  Oops... fix the fieldname I changed yesterday to be right.
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/contrib/scripts/sip-friends.sql

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/contrib/scripts/sip-friends.sql
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/contrib/scripts/sip-friends.sql?view=diff&rev=167664&r1=167663&r2=167664
==============================================================================
--- branches/1.6.0/contrib/scripts/sip-friends.sql (original)
+++ branches/1.6.0/contrib/scripts/sip-friends.sql Thu Jan  8 08:31:37 2009
@@ -5,7 +5,7 @@
 CREATE TABLE `sipfriends` (
   `name` varchar(40) NOT NULL default '',
   `type` varchar(10) NOT NULL default '',
-  `defaultname` varchar(40),
+  `defaultuser` varchar(40),
   `fromuser` varchar(40),
   `fromdomain` varchar(40),
   `secret` varchar(40),