[asterisk-commits] qwell: branch 1.6.0 r111722 - in /branches/1.6.0: ./ channels/chan_skinny.c

[SVN commits to the Asterisk project]

Author: qwell
Date: Fri Mar 28 12:57:31 2008
New Revision: 111722

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

................
r111721 | qwell | 2008-03-28 12:57:12 -0500 (Fri, 28 Mar 2008) | 9 lines

Merged revisions 111720 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r111720 | qwell | 2008-03-28 12:55:05 -0500 (Fri, 28 Mar 2008) | 1 line

Remove unimplemented softkeys.  Prompted by issue #12325.
........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_skinny.c

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

Modified: branches/1.6.0/channels/chan_skinny.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_skinny.c?view=diff&rev=111722&r1=111721&r2=111722
==============================================================================
--- branches/1.6.0/channels/chan_skinny.c (original)
+++ branches/1.6.0/channels/chan_skinny.c Fri Mar 28 12:57:31 2008
@@ -737,8 +737,8 @@
 	SOFTKEY_CFWDALL,
 	SOFTKEY_CFWDBUSY,
 	SOFTKEY_DND,
-	SOFTKEY_GPICKUP,
-	SOFTKEY_CONFRN,
+	/*SOFTKEY_GPICKUP,
+	SOFTKEY_CONFRN,*/
 };
 
 static const uint8_t soft_key_default_connected[] = {
@@ -768,7 +768,7 @@
 	SOFTKEY_ENDCALL,
 	SOFTKEY_CFWDALL,
 	SOFTKEY_CFWDBUSY,
-	SOFTKEY_GPICKUP,
+	/*SOFTKEY_GPICKUP,*/
 };
 
 static const uint8_t soft_key_default_connwithtrans[] = {