diff options
| author | Krzysztof Kosi??ski <tweenk.pl@gmail.com> | 2010-11-25 20:51:17 +0000 |
|---|---|---|
| committer | Krzysztof Kosiński <tweenk.pl@gmail.com> | 2010-11-25 20:51:17 +0000 |
| commit | 0bd9f7e209d522dbcebe0449a91397fdd9e38977 (patch) | |
| tree | 834c7d02456658b57625ab68cc28f7854a5a85dc /src/io | |
| parent | Fix handling of x and y attributes of patterns (diff) | |
| parent | Fix ruler redraw issue on GTK 2.22 (diff) | |
| download | inkscape-0bd9f7e209d522dbcebe0449a91397fdd9e38977.tar.gz inkscape-0bd9f7e209d522dbcebe0449a91397fdd9e38977.zip | |
Merge from trunk
(bzr r9508.1.70)
Diffstat (limited to 'src/io')
| -rw-r--r-- | src/io/resource.cpp | 2 | ||||
| -rw-r--r-- | src/io/resource.h | 2 | ||||
| -rw-r--r-- | src/io/simple-sax.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/io/resource.cpp b/src/io/resource.cpp index 1f6f8459c..8c76c7132 100644 --- a/src/io/resource.cpp +++ b/src/io/resource.cpp @@ -106,4 +106,4 @@ Util::ptr_shared<char> get_path(Domain domain, Type type, char const *filename) 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/io/resource.h b/src/io/resource.h index a5269899f..be3ff21b7 100644 --- a/src/io/resource.h +++ b/src/io/resource.h @@ -63,4 +63,4 @@ Util::ptr_shared<char> get_path(Domain domain, Type type, 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/io/simple-sax.cpp b/src/io/simple-sax.cpp index d8733858b..33e7b72bf 100644 --- a/src/io/simple-sax.cpp +++ b/src/io/simple-sax.cpp @@ -1491,4 +1491,4 @@ void FlatSaxHandler::_characters(const xmlChar *ch, int len) 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 : |