diff options
| author | Mihaela Jurković <mihaela.jurkovic@gmail.com> | 2018-02-11 22:55:25 +0000 |
|---|---|---|
| committer | Mihaela Jurković <mihaela.jurkovic@gmail.com> | 2018-02-11 22:55:25 +0000 |
| commit | e4574627188824cf90dbcea4e7d043e6be47b082 (patch) | |
| tree | 0005b509561907cdce7c7839509774a2c0ae4625 /src/extension | |
| parent | I removed some unnecessary window geometry, Inkscape version, text styles, I ... (diff) | |
| parent | Misc. typos (diff) | |
| download | inkscape-e4574627188824cf90dbcea4e7d043e6be47b082.tar.gz inkscape-e4574627188824cf90dbcea4e7d043e6be47b082.zip | |
Merge branch 'master' into 'master'
Master commit to prkos. Test of reverse merging
See merge request prkos/inkscape!1
Diffstat (limited to 'src/extension')
| -rw-r--r-- | src/extension/dependency.cpp | 2 | ||||
| -rw-r--r-- | src/extension/effect.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/extension/dependency.cpp b/src/extension/dependency.cpp index b83c5380f..5e843ee11 100644 --- a/src/extension/dependency.cpp +++ b/src/extension/dependency.cpp @@ -104,7 +104,7 @@ Dependency::~Dependency (void) \return Whether or not the dependency passes. This function depends largely on all of the enums. The first level - that is evaluted is the \c _type. + that is evaluated is the \c _type. If the type is \c TYPE_EXTENSION then the id for the extension is looked up in the database. If the extension is found, and it is diff --git a/src/extension/effect.h b/src/extension/effect.h index 143243a2e..f6eff09b1 100644 --- a/src/extension/effect.h +++ b/src/extension/effect.h @@ -45,7 +45,7 @@ class Effect : public Extension { void merge_menu (Inkscape::XML::Node * base, Inkscape::XML::Node * start, Inkscape::XML::Node * patern, Inkscape::XML::Node * mergee); /** \brief This is the verb type that is used for all effect's verbs. - It provides convience functions and maintains a pointer + It provides convenience functions and maintains a pointer back to the effect that created it. */ class EffectVerb : public Inkscape::Verb { private: |