summaryrefslogtreecommitdiffstats
path: root/src/display/nr-style.cpp
diff options
context:
space:
mode:
authorMarkus Engel <markus.engel@tum.de>2013-04-20 21:21:33 +0000
committerMarkus Engel <markus.engel@tum.de>2013-04-20 21:21:33 +0000
commit39580f4b417374ccba9d504f028388b2a2932506 (patch)
treea4337231a1b27403dceb49810ea618297ed0b659 /src/display/nr-style.cpp
parentMerging of EventContext classes complete. (diff)
parentGroup bbox update (Bug 1168979) (diff)
downloadinkscape-39580f4b417374ccba9d504f028388b2a2932506.tar.gz
inkscape-39580f4b417374ccba9d504f028388b2a2932506.zip
merged from trunk (r12287)
(bzr r11608.1.99)
Diffstat (limited to 'src/display/nr-style.cpp')
-rw-r--r--src/display/nr-style.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/display/nr-style.cpp b/src/display/nr-style.cpp
index ba2340074..26d70ad15 100644
--- a/src/display/nr-style.cpp
+++ b/src/display/nr-style.cpp
@@ -220,4 +220,4 @@ void NRStyle::update()
fill-column:99
End:
*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :