[asterisk-commits] russell: branch 1.6.1 r153653 - in /branches/1.6.1: ./ include/asterisk/

[SVN commits to the Asterisk project]

Author: russell
Date: Sun Nov  2 14:07:30 2008
New Revision: 153653

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

................
r153652 | russell | 2008-11-02 14:06:03 -0600 (Sun, 02 Nov 2008) | 10 lines

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

........
r153651 | russell | 2008-11-02 13:51:17 -0600 (Sun, 02 Nov 2008) | 2 lines

features.h depends on linkedlists.h, so include it

........

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

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/include/asterisk/features.h

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

Modified: branches/1.6.1/include/asterisk/features.h
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/include/asterisk/features.h?view=diff&rev=153653&r1=153652&r2=153653
==============================================================================
--- branches/1.6.1/include/asterisk/features.h (original)
+++ branches/1.6.1/include/asterisk/features.h Sun Nov  2 14:07:30 2008
@@ -25,6 +25,7 @@
 #define _AST_FEATURES_H
 
 #include "asterisk/pbx.h"
+#include "asterisk/linkedlists.h"
 
 #define FEATURE_MAX_LEN		11
 #define FEATURE_APP_LEN		64