diff options
| author | Noel Power <noel.power@novell.com> | 2010-10-13 13:22:42 +0100 |
|---|---|---|
| committer | Noel Power <noel.power@novell.com> | 2010-10-13 13:22:42 +0100 |
| commit | 50a13b7f4166ec2b305226cc81520ccc6010ff69 (patch) | |
| tree | c3ef2cb9f135003cecc60d1373f59dca34475b8c /xmloff/inc | |
| parent | 4e7e749fc2306995eaab3411c0cfc4c8785a5172 (diff) | |
| parent | a7458f68ae3b7a5c07e5c4455f44d2509ddd63bc (diff) | |
Merge commit 'origin/master'
Conflicts:
vbahelper/source/vbahelper/vbadialogbase.cxx
Diffstat (limited to 'xmloff/inc')
| -rw-r--r-- | xmloff/inc/pch/precompiled_xmloff.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/xmloff/inc/pch/precompiled_xmloff.cxx b/xmloff/inc/pch/precompiled_xmloff.cxx index 3a50f7fcdf79..31570f2a2bb1 100644 --- a/xmloff/inc/pch/precompiled_xmloff.cxx +++ b/xmloff/inc/pch/precompiled_xmloff.cxx @@ -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. @@ -27,3 +28,4 @@ #include "precompiled_xmloff.hxx" +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |