Commit 660fb048 authored by Albert Astals Cid's avatar Albert Astals Cid
Browse files

Merge remote-tracking branch 'origin/release/21.04'

parents 2ad8949c 17c398d9
...@@ -204,7 +204,7 @@ static bool visit( const ObjectCalcer* o, const std::vector<ObjectCalcer*>& from ...@@ -204,7 +204,7 @@ static bool visit( const ObjectCalcer* o, const std::vector<ObjectCalcer*>& from
std::vector<ObjectCalcer*> parents = o->parents(); std::vector<ObjectCalcer*> parents = o->parents();
for ( uint i = 0; i < parents.size(); ++i ) for ( uint i = 0; i < parents.size(); ++i )
{ {
bool v = visit( parents[i], from, ret ); bool v = ::visit( parents[i], from, ret );
somedepend |= v; somedepend |= v;
alldepend &= v; alldepend &= v;
deps[i] = v; deps[i] = v;
......
...@@ -124,6 +124,7 @@ ...@@ -124,6 +124,7 @@
<caption xml:lang="pl">Interaktywna geometria z Kig</caption> <caption xml:lang="pl">Interaktywna geometria z Kig</caption>
<caption xml:lang="pt">Geometria Interactiva com o Kig</caption> <caption xml:lang="pt">Geometria Interactiva com o Kig</caption>
<caption xml:lang="pt-BR">Geometria interativa com o Kig</caption> <caption xml:lang="pt-BR">Geometria interativa com o Kig</caption>
<caption xml:lang="sk">Interaktívna geometria s Kigom</caption>
<caption xml:lang="sl">Interaktivna geometrija s Kig</caption> <caption xml:lang="sl">Interaktivna geometrija s Kig</caption>
<caption xml:lang="sv">Interaktiv geometri med Kig</caption> <caption xml:lang="sv">Interaktiv geometri med Kig</caption>
<caption xml:lang="uk">Інтерактивна геометрія у Kig</caption> <caption xml:lang="uk">Інтерактивна геометрія у Kig</caption>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment