diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 11:57:43 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 11:57:43 +0200 |
commit | fd0649408ac52ec0c6a443c5716d50c9243bca7e (patch) | |
tree | 5c5472ebd37157ec38bef497ddad7c8fa4acfbba /cppuhelper/source/macro_expander.hxx | |
parent | ea3da31396ff5a1d88efdbd6e53f2c1b1794ccb0 (diff) | |
parent | 1247c8b2350734c4f16bbc15404c3c7d56bf8523 (diff) |
Merge branch 'master' into feature/gnumake4
Conflicts:
xmlreader/prj/d.lst
Diffstat (limited to 'cppuhelper/source/macro_expander.hxx')
-rw-r--r-- | cppuhelper/source/macro_expander.hxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cppuhelper/source/macro_expander.hxx b/cppuhelper/source/macro_expander.hxx index f39762d99..d9914aeec 100644 --- a/cppuhelper/source/macro_expander.hxx +++ b/cppuhelper/source/macro_expander.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -58,3 +59,5 @@ namespace detail { } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |