manually merging the INKBOARD_PEDRO branch into trunk

[inkscape.git] / src / jabber_whiteboard / internal-constants.cpp

diff --git a/src/jabber_whiteboard/internal-constants.cpp b/src/jabber_whiteboard/internal-constants.cpp
index 4956a402c54ab7cfe9cc2756117cf46425816c3b..44355c8a0f32920bdb3874aa067e5d75e048d86c 100644 (file)
--- a/src/jabber_whiteboard/internal-constants.cpp
+++ b/src/jabber_whiteboard/internal-constants.cpp
@@ -68,9 +68,9 @@ int const SEND_TIMEOUT = 35;
   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 :