Merge branch 'feature/upstream' into develop

4 files changed, 123 insertions, 0 deletions

diff --git a/app/doc/CMakeFiles/help-html.dir/DependInfo.cmake b/app/doc/CMakeFiles/help-html.dir/DependInfo.cmake
new file mode 100644
index 0000000..19fab21
--- /dev/null
+++ b/app/doc/CMakeFiles/help-html.dir/DependInfo.cmake
@@ -0,0 +1,11 @@
+# The set of languages for which implicit dependencies are needed:
+set(CMAKE_DEPENDS_LANGUAGES
+  )
+# The set of files for implicit dependencies of each language:
+
+# Targets to which this target links.
+set(CMAKE_TARGET_LINKED_INFO_FILES
+  )
+
+# Fortran module output directory.
+set(CMAKE_Fortran_TARGET_MODULE_DIR "")
diff --git a/app/doc/CMakeFiles/help-html.dir/build.make b/app/doc/CMakeFiles/help-html.dir/build.make
new file mode 100644
index 0000000..cd8fb49
--- /dev/null
+++ b/app/doc/CMakeFiles/help-html.dir/build.make
@@ -0,0 +1,101 @@
+# CMAKE generated file: DO NOT EDIT!
+# Generated by "Unix Makefiles" Generator, CMake Version 3.6
+
+# Delete rule output on recipe failure.
+.DELETE_ON_ERROR:
+
+
+#=============================================================================
+# Special targets provided by cmake.
+
+# Disable implicit rules so canonical targets will work.
+.SUFFIXES:
+
+
+# Remove some rules from gmake that .SUFFIXES does not remove.
+SUFFIXES =
+
+.SUFFIXES: .hpux_make_needs_suffix_list
+
+
+# Suppress display of executed commands.
+$(VERBOSE).SILENT:
+
+
+# A target that is always out of date.
+cmake_force:
+
+.PHONY : cmake_force
+
+#=============================================================================
+# Set environment variables for the build.
+
+# The shell in which to execute make rules.
+SHELL = /bin/sh
+
+# The CMake executable.
+CMAKE_COMMAND = /usr/bin/cmake
+
+# The command to remove a file.
+RM = /usr/bin/cmake -E remove -f
+
+# Escaping for special characters.
+EQUALS = =
+
+# The top-level source directory on which CMake was run.
+CMAKE_SOURCE_DIR = /home/martin/XTrackCAD/src/work
+
+# The top-level build directory on which CMake was run.
+CMAKE_BINARY_DIR = /home/martin/XTrackCAD/src/work
+
+# Utility rule file for help-html.
+
+# Include the progress variables for this target.
+include app/doc/CMakeFiles/help-html.dir/progress.make
+
+app/doc/CMakeFiles/help-html: app/doc/html/index.html
+
+
+app/doc/html/index.html: app/tools/halibut/halibut
+app/doc/html/index.html: app/doc/linconf.but
+app/doc/html/index.html: app/doc/intro.but
+app/doc/html/index.html: app/doc/addm.but
+app/doc/html/index.html: app/doc/changem.but
+app/doc/html/index.html: app/doc/drawm.but
+app/doc/html/index.html: app/doc/editm.but
+app/doc/html/index.html: app/doc/filem.but
+app/doc/html/index.html: app/doc/helpm.but
+app/doc/html/index.html: app/doc/hotbar.but
+app/doc/html/index.html: app/doc/macrom.but
+app/doc/html/index.html: app/doc/managem.but
+app/doc/html/index.html: app/doc/optionm.but
+app/doc/html/index.html: app/doc/statusbar.but
+app/doc/html/index.html: app/doc/view_winm.but
+app/doc/html/index.html: app/doc/navigation.but
+app/doc/html/index.html: app/doc/appendix.but
+app/doc/html/index.html: app/help/messages.but
+app/doc/html/index.html: app/doc/upgrade.but
+app/doc/html/index.html: app/doc/warranty.but
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --blue --bold --progress-dir=/home/martin/XTrackCAD/src/work/CMakeFiles --progress-num=$(CMAKE_PROGRESS_1) "Generating html/index.html"
+	cd /home/martin/XTrackCAD/src/work/app/doc/html && /usr/bin/cmake -P /home/martin/XTrackCAD/src/work/app/doc/clean-html.cmake
+	cd /home/martin/XTrackCAD/src/work/app/doc/html && /home/martin/XTrackCAD/src/work/app/tools/halibut/halibut /home/martin/XTrackCAD/src/work/app/doc/linconf.but /home/martin/XTrackCAD/src/work/app/doc/intro.but /home/martin/XTrackCAD/src/work/app/doc/addm.but /home/martin/XTrackCAD/src/work/app/doc/changem.but /home/martin/XTrackCAD/src/work/app/doc/drawm.but /home/martin/XTrackCAD/src/work/app/doc/editm.but /home/martin/XTrackCAD/src/work/app/doc/filem.but /home/martin/XTrackCAD/src/work/app/doc/helpm.but /home/martin/XTrackCAD/src/work/app/doc/hotbar.but /home/martin/XTrackCAD/src/work/app/doc/macrom.but /home/martin/XTrackCAD/src/work/app/doc/managem.but /home/martin/XTrackCAD/src/work/app/doc/optionm.but /home/martin/XTrackCAD/src/work/app/doc/statusbar.but /home/martin/XTrackCAD/src/work/app/doc/view_winm.but /home/martin/XTrackCAD/src/work/app/doc/navigation.but /home/martin/XTrackCAD/src/work/app/doc/appendix.but /home/martin/XTrackCAD/src/work/app/help/messages.but /home/martin/XTrackCAD/src/work/app/doc/upgrade.but /home/martin/XTrackCAD/src/work/app/doc/warranty.but
+
+help-html: app/doc/CMakeFiles/help-html
+help-html: app/doc/html/index.html
+help-html: app/doc/CMakeFiles/help-html.dir/build.make
+
+.PHONY : help-html
+
+# Rule to build all files generated by this target.
+app/doc/CMakeFiles/help-html.dir/build: help-html
+
+.PHONY : app/doc/CMakeFiles/help-html.dir/build
+
+app/doc/CMakeFiles/help-html.dir/clean:
+	cd /home/martin/XTrackCAD/src/work/app/doc && $(CMAKE_COMMAND) -P CMakeFiles/help-html.dir/cmake_clean.cmake
+.PHONY : app/doc/CMakeFiles/help-html.dir/clean
+
+app/doc/CMakeFiles/help-html.dir/depend:
+	cd /home/martin/XTrackCAD/src/work && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /home/martin/XTrackCAD/src/work /home/martin/XTrackCAD/src/work/app/doc /home/martin/XTrackCAD/src/work /home/martin/XTrackCAD/src/work/app/doc /home/martin/XTrackCAD/src/work/app/doc/CMakeFiles/help-html.dir/DependInfo.cmake --color=$(COLOR)
+.PHONY : app/doc/CMakeFiles/help-html.dir/depend
+
diff --git a/app/doc/CMakeFiles/help-html.dir/cmake_clean.cmake b/app/doc/CMakeFiles/help-html.dir/cmake_clean.cmake
new file mode 100644
index 0000000..81f9e7f
--- /dev/null
+++ b/app/doc/CMakeFiles/help-html.dir/cmake_clean.cmake
@@ -0,0 +1,9 @@
+file(REMOVE_RECURSE
+  "CMakeFiles/help-html"
+  "html/index.html"
+)
+
+# Per-language clean rules from dependency scanning.
+foreach(lang )
+  include(CMakeFiles/help-html.dir/cmake_clean_${lang}.cmake OPTIONAL)
+endforeach()
diff --git a/app/doc/CMakeFiles/help-html.dir/progress.make b/app/doc/CMakeFiles/help-html.dir/progress.make
new file mode 100644
index 0000000..225de34
--- /dev/null
+++ b/app/doc/CMakeFiles/help-html.dir/progress.make
@@ -0,0 +1,2 @@
+CMAKE_PROGRESS_1 = 
+