diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 12:54:22 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 12:54:22 +0200 |
| commit | e2682561337c521f10fa2c87594c86c01b3c662a (patch) | |
| tree | a8cb220cf9888183c2de5edd3644597c63b67b9a /extensions/inc/appsettings.hxx | |
| parent | 68f53efa2572acc661c8a75ee2ec09f87348aa65 (diff) | |
| parent | f9c2beb2cdb4ae448d22ae390c63159b88df9e9e (diff) | |
Merge branch 'master' into feature/gnumake4
Conflicts:
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
lingucomponent/source/spellcheck/spell/sspellimp.cxx
setup_native/prj/build.lst
setup_native/prj/d.lst
wizards/Jar_query.mk
wizards/Module_wizards.mk
wizards/Zip_launcher.mk
wizards/com/sun/star/wizards/report/makefile.mk
wizards/prj/build.lst
wizards/prj/d.lst
wizards/util/target.pmk
Diffstat (limited to 'extensions/inc/appsettings.hxx')
| -rw-r--r-- | extensions/inc/appsettings.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extensions/inc/appsettings.hxx b/extensions/inc/appsettings.hxx index 152843af51ca..8622db0bd77e 100644 --- a/extensions/inc/appsettings.hxx +++ b/extensions/inc/appsettings.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. @@ -27,9 +28,7 @@ #ifndef _APPSETTINGS_HXX #define _APPSETTINGS_HXX -#ifndef __STARDIV_UNO_UTIL_CONTAINR_HXX__ #include <stardiv/uno/util/containr.hxx> -#endif #ifdef __cplusplus extern "C" { @@ -43,3 +42,4 @@ XNameContainer* getApplicationSettings(); #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |