From fcadbfb31e9e8bd463a16369e3de2ec96a413a6a Mon Sep 17 00:00:00 2001 From: daleharvey Date: Fri, 23 Jun 2006 13:15:16 +0000 Subject: manually merging the INKBOARD_PEDRO branch into trunk (bzr r1268) --- src/jabber_whiteboard/message-node.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/jabber_whiteboard/message-node.h') diff --git a/src/jabber_whiteboard/message-node.h b/src/jabber_whiteboard/message-node.h index 5e1b6a674..a9ed84e6f 100644 --- a/src/jabber_whiteboard/message-node.h +++ b/src/jabber_whiteboard/message-node.h @@ -126,9 +126,9 @@ private: Local Variables: mode:c++ c-file-style:"stroustrup" - c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +)) + c-file-offsets:((innamespace . 0)(inline-open . 0)) indent-tabs-mode:nil fill-column:99 End: */ -// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 : +// vim: filetype=c++:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 : -- cgit v1.2.3