diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2013-04-18 21:28:17 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2013-04-18 21:28:17 +0000 |
| commit | ff4d08c8cdd344469f346cdd647ce6b694a7abfe (patch) | |
| tree | 8aecfa53b38a0fafea32fe933d5651c3f0915a02 /src/display | |
| parent | merge from trunk (r12272) (diff) | |
| parent | Add symbolic icons set by Jimmac & Barbara Muraus (diff) | |
| download | inkscape-ff4d08c8cdd344469f346cdd647ce6b694a7abfe.tar.gz inkscape-ff4d08c8cdd344469f346cdd647ce6b694a7abfe.zip | |
merge from trunk (r12281)
(bzr r11668.1.67)
Diffstat (limited to 'src/display')
| -rw-r--r-- | src/display/cairo-utils.h | 2 | ||||
| -rw-r--r-- | src/display/nr-style.cpp | 2 | ||||
| -rw-r--r-- | src/display/nr-style.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/display/cairo-utils.h b/src/display/cairo-utils.h index 2596cd969..016f72d00 100644 --- a/src/display/cairo-utils.h +++ b/src/display/cairo-utils.h @@ -203,4 +203,4 @@ inline guint AssembleARGB32(guint32 a, guint32 r, guint32 g, guint32 b) 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 : 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 : diff --git a/src/display/nr-style.h b/src/display/nr-style.h index 80547c43e..cd0bd208f 100644 --- a/src/display/nr-style.h +++ b/src/display/nr-style.h @@ -81,4 +81,4 @@ struct NRStyle { 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 : |