diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2019-01-27 21:37:03 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2019-02-18 21:18:27 +0000 |
| commit | 47c3e89671c6de12fc08977db56ed3de227807a4 (patch) | |
| tree | 5918b5c4c4a6b0ae97198d8e168f1b072b8690ee /src/live_effects/effect-enum.h | |
| parent | Add CSS function to check we are in dark theme (diff) | |
| download | inkscape-47c3e89671c6de12fc08977db56ed3de227807a4.tar.gz inkscape-47c3e89671c6de12fc08977db56ed3de227807a4.zip | |
adding symbols
Diffstat (limited to 'src/live_effects/effect-enum.h')
| -rw-r--r-- | src/live_effects/effect-enum.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/live_effects/effect-enum.h b/src/live_effects/effect-enum.h index 97c3cda9a..2b9b2e25e 100644 --- a/src/live_effects/effect-enum.h +++ b/src/live_effects/effect-enum.h @@ -78,10 +78,6 @@ enum EffectType { INVALID_LPE // This must be last (I made it such that it is not needed anymore I think..., Don't trust on it being last. - johan) }; -<<<<<<< HEAD -extern const Util::EnumData<EffectType> LPETypeData[]; /// defined in effect.cpp -extern const Util::EnumDataConverter<EffectType> LPETypeConverter; /// defined in effect.cpp -======= template <typename E> struct EnumEffectData { E id; @@ -983,7 +979,6 @@ const EnumEffectData<EffectType> LPETypeData[] = { extern const EnumEffectData<EffectType> LPETypeData[]; /// defined in effect.cpp extern const EnumEffectDataConverter<EffectType> LPETypeConverter; /// defined in effect.cpp ->>>>>>> fixing coding style and translation and merge from master } //namespace LivePathEffect } //namespace Inkscape |