Merge branch 'release/1.7'

devinsmith · Nov 3, 2022 · e556067 · e556067
2 parents 42f9fd0 + 349aedd
commit e556067
Show file tree

Hide file tree

Showing 254 changed files with 6,067 additions and 4,177 deletions.
diff --git a/.gitignore b/.gitignore
@@ -40,3 +40,20 @@ cmake-build-*/
 
 Makefile.in
 Makefile.am
+
+# Generated files
+adie/help.cpp
+adie/help.h
+adie/icons.h
+adie/icons.cpp
+calculator/icons.cpp
+calculator/icons.h
+chart/icons.cpp
+chart/icons.h
+controlpanel/icons.cpp
+controlpanel/icons.h
+pathfinder/icons.cpp
+pathfinder/icons.h
+shutterbug/icons.cpp
+shutterbug/icons.h
+