manually merging the INKBOARD_PEDRO branch into trunk

[inkscape.git] / src / jabber_whiteboard / tracker-node.h

diff --git a/src/jabber_whiteboard/tracker-node.h b/src/jabber_whiteboard/tracker-node.h
index bbaf527ced5b7df14396af88ffa6639100031b94..120c4d00ed0329acb16d8ccc64313a115835c444 100644 (file)
--- a/src/jabber_whiteboard/tracker-node.h
+++ b/src/jabber_whiteboard/tracker-node.h
@@ -86,9 +86,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 :