Solving merge conflicts with develop

2026-05-08 04:20:14 -05:00 · 2015-04-18 16:10:05 -04:00
parent dd67c005a4 a974fd62e1
commit 2b8b8c0416
81 changed files with 1413 additions and 530 deletions
@@ -72,6 +72,7 @@ namespace scenegraph {
 namespace scenegraphnode {
    const std::string keyName = "Name";
    const std::string keyParentName = "Parent";
+    const std::string keyDependencies = "Dependencies";
    const std::string keyRenderable = "Renderable";
    const std::string keyEphemeris = "Ephemeris";
 } // namespace scenegraphnode