diff options
| author | Thomas Preud'homme <robotux@celest.fr> | 2018-05-29 05:44:54 +0100 |
|---|---|---|
| committer | Thomas Preud'homme <robotux@celest.fr> | 2018-05-29 05:44:54 +0100 |
| commit | 3ab7ec581fb0d491a9c78013c5932630a4617d47 (patch) | |
| tree | 0ece7552ab2861a5e07b59d0cb6e00707cf065dc /plugins/Themes/Oxygen/ThemesFactory.h | |
| parent | 316a0f5ee6cb7a2ba545e595b6958f3cbebf6d48 (diff) | |
| parent | 594fcba67600704bee9115c86e18927b2237b304 (diff) | |
record new upstream branch and merge it
Diffstat (limited to 'plugins/Themes/Oxygen/ThemesFactory.h')
| -rw-r--r-- | plugins/Themes/Oxygen/ThemesFactory.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/Themes/Oxygen/ThemesFactory.h b/plugins/Themes/Oxygen/ThemesFactory.h index f5e304f..3eb76f6 100644 --- a/plugins/Themes/Oxygen/ThemesFactory.h +++ b/plugins/Themes/Oxygen/ThemesFactory.h @@ -3,8 +3,8 @@ \author alpha_one_x86 \licence GPL3, see the file COPYING */ -#ifndef FACTORY_H -#define FACTORY_H +#ifndef FACTORYTHEMEOXYGEN_H +#define FACTORYTHEMEOXYGEN_H #include <QObject> #include <QWidget> |