ui: Fixed group related issues in graph

* fixed aggregation layout within group
* fixed moving of group did not resize view
* fixed edges behind group could not be hovered
* fixed overlapping lines in sublayout
* fixed use of correct column width in sublayout

.gitignore

@@ -10,9 +10,9 @@
 /bin/app/*.log
 
 /bin/test/data/log/
-/bin/test/data/temp.xml
 /bin/test/data/TestSettings.xml
 /bin/test/data/CommandlineTestSuite/settings.xml
+/bin/test/data/ConfigManagerTestSuite/temp.xml
 
 /java_indexer/target/
 

.gitlab-ci.yml

@@ -1,7 +1,7 @@
 variables:
     MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository"
-    IMAGE_64: coatisoftware/centos6_64_qt_llvm:qt591-llvm500
-    IMAGE_32: coatisoftware/centos6_32_qt_llvm:qt591-llvm500
+    IMAGE_64: coatisoftware/centos6_64_qt_llvm:qt5101-llvm600
+    IMAGE_32: coatisoftware/centos6_32_qt_llvm:qt5101-llvm600
 
 ## Templates ##
 
@@ -15,8 +15,7 @@ variables:
     script:
         - ./script/buildonly.sh all
         - ./script/buildonly.sh package
-        - ./build/Release/app/Sourcetrail config -z ./setup/license.txt
-        - ./script/build.sh r test
+        - ./script/build.sh release test
     artifacts:
         name: "$CI_JOB_NAME"
         paths:
@@ -74,7 +73,7 @@ LicenseGenerator:
     when: manual
     script:
         - ./script/setup.sh
-        - ./script/buildonly.sh r keygen
+        - ./script/buildonly.sh release keygen
         - mv build/Release/license_generator/Sourcetrail_license_generator .
     artifacts:
         name: "$CI_JOB_NAME"

CHANGELOG.md

@@ -1,5 +1,145 @@
 ### Changelog
 
+#### 2018.1.19
+released 2018-01-30
+
+* Fixed crash on filling DirectoryListBox with no selected items (issue #544, #545)
+* Graph: Improved type node contrast in bright color scheme
+* Code: Fixed going back in history sometimes showed the wrong file when an edge was activated last
+* Code: Clicking on active location will activate it again and show it's definition
+* Graph: Don't keep expanded nodes expanded after using symbol search
+* Fixed file picker didn't start in recent directory when exporting graph as image (issue #541)
+* Code: Fixed file content shown multiple times when clicking title button of non-indexed file with errors
+* Preferences: Only show latin fonts in the font face dropdown
+* Code: Fixed gaps in line indicators for some font faces
+* Windows: Show indexing progress in Windows task bar
+* Linux: Added settings to change screen scaling to preferences (issue #518, #523)
+* Allow for disabling certain Source Groups via Status checkbox in the "Edit Project" dialog
+* C/C++: Fixed no indexed information saved for compilation database referencing certain compiler (issue #531)
+* Increased history dropdown list size to 50 items
+* Still allow project refresh if database file can't be loaded
+* Removed focus outlines from push buttons
+* Graph: Display warning when depth graph has more than 1000 nodes
+* Code: Fixed screen search matches not always cleared in single file mode
+* C/C++: Implemented handling Microsoft inline assembly statements
+* C/C++: Added automatic include path detection to project setup
+* Java: Fixed project setup from Maven not working for projects without sub-modules
+* Windows: Changed default install directory to ".../Sourcetrail/"
+* Windows: Changed Sourcetrail font color in installer image
+* Windows: Fixed sourcetrail loader gif not showing up on some windows systems
+* Custom style for dock widget title bars with different colors in each color scheme
+* C++: Fixed bug where anonymous symbols were only partly named like the enclosing typedef
+* C/C++: Fixed policy for recording elements inside macro arguments and bodies
+* Allow users to ignore warning on non-existing paths in project setup
+* Code: Switch to single file view when clicking snippet maximize
+* Code: Show scrollbar at bottom of snippet list if bottom snippet is horizontally scrollable (issue #432)
+* Code: Keep snippet title bar at top when scrolling down (issue #479)
+* Fixed history dropdown opened again when clicking on button again
+* Code: Fixed single file view cleared when refreshing
+* Graph: Added "Exported from Sourcetrail" note to exported graph images
+* C/C++: Don't store commandline string for each error to save memory
+* Fixed delay when starting indexing until progress dialog shows up
+* Group include validation results by file and add line breaks for readability
+* Fixed location pickers used system root directory when empty
+* Graph: Add "bidirectional" to tooltip of bidirectional aggregation edges
+* Linux: Don't explicitely open terminal when running on Linux (issue #525)
+* Fixed files and directories dialog to offer selection of files (issue #521)
+* C++: Fixed cases where references to members were recorded as usage instead of call
+* Fixed crash when Start Screen is closed while checking for update
+* Search: Fixed selected text not deleted when pasting into search field (issue #527)
+* C++: Record template variable specialization edges
+* Code: Use different background color in snippet list to improve visual layering
+* Don't force full project refresh when project settings changed (issue #493)
+* Added indexing mode to reindex incomplete files (issue #496)
+* Java: Allow using .aar files as Java project dependencies
+* Java: fixed some Java exceptions and write Java exceptions to log file
+* Java: Note architecture of Java version in preferences dialog
+* Code: Show line indicators for fulltext search results and fixed matches at line start
+* Graph: Update visible depth graph when changing depth level slider (issue #484)
+* Always show all context menu actions, but disable unavailable ones
+* Graph: Hide nodes and edges via context menu action or Alt + Click (issue #472)
+* Graph: Added option to preferences to show/hide builtin types, default is hidden (issue #409)
+* Improved style and color of scrollbars and main window separators
+* Linux: Fixed icon sizes when scaling to highDPI fails
+* Search: Fixed cursor disappearing when entering long string in the search field
+* C++: Fixed parent node hierarchy for C++ template parameters of variable declarations
+* Linux: Fixed syntax error in Sourcetrail.sh (issue #519)
+* Graph: Improved exported image quality
+* Graph: Fixed exported graph image were too large (issue #511)
+* Fixed crashes due to double deleted Qt widgets
+* Fixed crash when specifying an unknown text encoding in the preferences
+* C++: Fixed retrieval of CXX template parameter declarations of parent
+* C/C++: Fixed filepaths to always be canonical (issue #516)
+* Graph: Fixed implicit nodes not auto-expanded when activated
+* C/C++: Add filename info to static functions (issue #515)
+
+
+#### 2017.4.46
+released 2017-11-09
+
+* C/C++: Add filename info to static global variables to avoid collision (issue #514)
+* Allow duplicate indexing of source files if the indexer command differs
+* Fixed single header files within indexed paths were not indexed (issue #513
+* Status: Explain differences of errors and how to fix them in help message dialog (issue #501)
+* C/C++: Add parent directories of source files in the compilation database automatically to indexed header paths
+* C/C++: Give clang higher precedence in automatic global header search path detection
+* C/C++: Added new clang 5.0.0 language standards to project setup dropdown box
+* Graph: Show nodes with more than 20 children initially collapsed (issue #509)
+* Show message box informing about shared memory problems before indexing (issue #508)
+* Fixed files from symlinked directories within indexed directories were not indexed
+* Start from correct directory for relative paths in project setup location pickers
+* Java: Added all previous Java versions to language standard selection
+* C++: Fixed recording template member specializations of methods as explicit nodes
+* C++: Fixed template members variables sometimes recorded as functions with call edges
+* C/C++: Fixed recorded location of function bodies defined inside macros
+* C/C++: Skip recording macro usages in non-indexed files
+* Search: Fixed focus and selection policy of search elements for Windows and Linux
+* Graph: Fixed type usage edges not shown between class members and inner class types
+* Graph: Fixed activation of bookmarked edge did not highlight edge in all situations
+* Status: Fixed resize status view table columns were only resizeable in the title bar (issue #506)
+* Added setting for text encoding to preferences (issue #500)
+* Search: Fixed low contrast of search field cursor in dark schemes (issue #487)
+
+
+#### 2017.4.20
+released 2017-10-25
+
+* Code: Fixed file state of snippets wrong after iterating references in single file view
+* Search: Improved selection on focus to allow editing of search query (issue #483)
+* Code: Fixed last line removed in full file view
+* Fixed local symbol activation via plugin shows empty view
+* Fixed handling of symbolic links when activated via plugin (issue #489)
+* Code: Fixed crash due to double deletion of elements (issue #488)
+* Code: Show shortcut 'Ctrl + Left Mouse' in code for 'Show in IDE' context menu action
+* Improved names, texts and order in project setup
+* macOS: Fixed start screen did not vanish when opening project with double click
+* Added Non-Commercial use option and removed trial mode
+* Linux: Moved install and uninstall scripts to top level directory in package
+* C++: Fixed record rvalue references as "&&" instead of "&"
+* C/C++: Added prefilling of indexed header paths for compilation database projects
+* Moved automatic update check setting to preferences and enable by default
+* Code: Added indexing of qualifier source locations and allow symbol activation by clicking qualifiers
+* Linux: Enabled Qt highDPI scaling to fix UI issues on high resolution screens
+* Fixed handling of non-indexed files in Graph and Code
+* C/C++: Removed include check validataion for compilation database source groups
+* Graph: Bundle nested anonymous namespaces into anonymous namespace bundle in namespace overview (issue #465)
+* Search: Fixed vertical growth of search bar area when resizing window
+* Visual Studio plugin: Lots off fixes, see changelog (https://github.com/CoatiSoftware/vs-sourcetrail/blob/master/CHANGELOG.md)
+* Sublime Text plugin: Fixed plugin not working when installed via Package Control (issue #468)
+* Windows: Added missing Qt dlls to save graph images as .jpg (issue #474)
+* C/C++: Updated to Clang 5.0.0
+* Code: Fixed annotations missing for full file snippets
+* Java: Added project setup from Gradle (issue #379)
+* Added "Find On-Screen" option with search bar at bottom of window for searching Graph and Code on-screen (issue #79)
+* Use "Find On-Screen" with 'Ctrl + D' or '/'
+* Graph: Added C++ template specialization and template member specialization edges
+* Graph: Show implicit children of implicit nodes
+* Code: Fixed syntax highlighting of inline comments
+* Code: Added syntax highlighting rule for char literals
+* C++: Improved recording of template member specializations
+* Refresh only files where content actually changed
+
+
 #### 2017.3.48
 released 2017-09-07
 

CMakeLists.txt

@@ -18,6 +18,7 @@ IF(${CMAKE_BINARY_DIR} STREQUAL ${CMAKE_SOURCE_DIR})
   MESSAGE(FATAL_ERROR "Please create a separate build directory and call CMake again")
 ENDIF(${CMAKE_BINARY_DIR} STREQUAL ${CMAKE_SOURCE_DIR})
 
+
 # Variables --------------------------------------------------------------------
 
 set(PROJECT_NAME Sourcetrail)
@@ -32,6 +33,7 @@ endif()
 
 set(APP_PROJECT_NAME "${PROJECT_NAME}")
 set(LIB_LICENSE_PROJECT_NAME "${PROJECT_NAME}_lib_license")
+set(LIB_UTILITY_PROJECT_NAME "${PROJECT_NAME}_lib_utility")
 set(LIB_GUI_PROJECT_NAME "${PROJECT_NAME}_lib_gui")
 set(LIB_CXX_PROJECT_NAME "${PROJECT_NAME}_lib_cxx")
 set(LIB_JAVA_PROJECT_NAME "${PROJECT_NAME}_lib_java")
@@ -56,6 +58,7 @@ else ()
 	set(PLATFORM_INCLUDE "includesLinux.h")
 endif ()
 
+
 # Project ----------------------------------------------------------------------
 
 project(${PROJECT_NAME})
@@ -74,7 +77,9 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_C_STANDARD 99)
 
+
 # Settings ---------------------------------------------------------------------
+
 if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-warning-option -fcolor-diagnostics")
 endif()
@@ -84,6 +89,7 @@ endif()
 	#add_definitions(-fno-omit-frame-pointer)
 #endif ()
 
+
 # Clang ------------------------------------------------------------------------
 
 if (UNIX AND APPLE)
@@ -106,6 +112,7 @@ find_package(CLANG REQUIRED PATHS "${CMAKE_SOURCE_DIR}/cmake" NO_DEFAULT_PATH)
 
 add_definitions(${CLANG_DEFINITIONS})
 
+
 # Boost ------------------------------------------------------------------------
 
 set(Boost_USE_MULTITHREAD ON)
@@ -132,7 +139,8 @@ endif()
 
 find_package(Boost 1.64 COMPONENTS system program_options filesystem date_time REQUIRED)
 
-# Botan -------------------------------------------------------------------------
+
+# Botan ------------------------------------------------------------------------
 
 set(BOTAN_VERSION "botan-2")
 
@@ -184,7 +192,47 @@ if(NOT BOTAN_INCLUDE_DIR)
 endif()
 
 
-# Lib License -------------------------------------------------------------------
+# Qt ---------------------------------------------------------------------------
+
+# Find the QtWidgets library
+if(UNIX)
+	set(CMAKE_PREFIX_PATH "$ENV{QT_DIR}/")
+
+	if(APPLE)
+		set(Qt5Widgets_DIR "$ENV{QT_DIR}/cmake/Qt5Widgets/")
+		set(Qt5PrintSupport_DIR "$ENV{QT_DIR}/cmake/Qt5PrintSupport/")
+	endif()
+
+else()
+	if(${WINXXBITS} STREQUAL "Win32")
+		set(CMAKE_PREFIX_PATH "$ENV{QT_WIN32_DIR}/")
+	else()
+		set(CMAKE_PREFIX_PATH "$ENV{QT_WIN64_DIR}/")
+	endif()
+	set(Qt5Widgets_DIR "${CMAKE_PREFIX_PATH}/lib/cmake/Qt5Widgets")
+	set(Qt5PrintSupport_DIR "${CMAKE_PREFIX_PATH}/lib/cmake/Qt5PrintSupport")
+	set(Qt5Network_DIR "${CMAKE_PREFIX_PATH}/lib/cmake/Qt5Network")
+	set(Qt5WinExtras_DIR "${CMAKE_PREFIX_PATH}/lib/cmake/Qt5WinExtras")
+endif()
+
+find_package(Qt5Widgets)
+find_package(Qt5PrintSupport)
+find_package(Qt5Network)
+
+if (WIN32)
+	find_package(Qt5WinExtras)
+endif()
+
+if(Qt5Widgets_FOUND)
+	MESSAGE(STATUS "Found Qt ${Qt5Widgets_VERSION_STRING}")
+	# FIX: Qt was built with -reduce-relocations
+	if (Qt5_POSITION_INDEPENDENT_CODE)
+		SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
+	endif()
+endif()
+
+
+# Lib License ------------------------------------------------------------------
 
 if (UNIX)
 	set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}/lib/")
@@ -223,6 +271,31 @@ else()
 endif()
 
 
+# Lib Utility ------------------------------------------------------------------
+
+add_subdirectory(src/lib_utility)
+
+add_library(${LIB_UTILITY_PROJECT_NAME} ${LIB_UTILITY_FILES})
+
+create_source_groups(${LIB_UTILITY_FILES})
+
+set_property(
+	TARGET ${LIB_UTILITY_PROJECT_NAME}
+	PROPERTY INCLUDE_DIRECTORIES
+		"${CMAKE_SOURCE_DIR}/src/lib_utility"
+)
+
+target_include_directories(${LIB_UTILITY_PROJECT_NAME} SYSTEM
+	PUBLIC ${Boost_INCLUDE_DIR}
+)
+
+if(UNIX)
+	target_link_libraries(${LIB_UTILITY_PROJECT_NAME} ${Boost_LIBRARIES} Qt5::Widgets Qt5::Network)
+else()
+	target_link_libraries(${LIB_UTILITY_PROJECT_NAME} ${Boost_LIBRARIES} Qt5::Widgets Qt5::Network Qt5::WinExtras)
+endif()
+
+
 # Lib --------------------------------------------------------------------------
 
 add_subdirectory(src/lib)
@@ -244,6 +317,7 @@ set_property(
 		"${CMAKE_SOURCE_DIR}/src/external"
 		"${CMAKE_SOURCE_DIR}/src/lib_license"
 		"${CMAKE_SOURCE_DIR}/src/lib_gui"
+		"${CMAKE_SOURCE_DIR}/src/lib_utility"
 		"${CMAKE_BINARY_DIR}/src/lib_license"
 		"${CMAKE_SOURCE_DIR}/src/lib_cxx"
 		"${CMAKE_SOURCE_DIR}/src/lib_java"
@@ -254,10 +328,10 @@ target_include_directories(${LIB_PROJECT_NAME} SYSTEM
 	"${CMAKE_SOURCE_DIR}/src/external"
 )
 
-target_link_libraries(${LIB_PROJECT_NAME} ${Boost_LIBRARIES} ${LIB_LICENSE_PROJECT_NAME})
+target_link_libraries(${LIB_PROJECT_NAME} ${LIB_UTILITY_PROJECT_NAME} ${LIB_LICENSE_PROJECT_NAME} ${Boost_LIBRARIES})
 
 
-# Lib Cxx -------------------------------------------------------------------
+# Lib Cxx ----------------------------------------------------------------------
 
 add_subdirectory(src/lib_cxx)
 
@@ -269,6 +343,7 @@ set_property(
 	TARGET ${LIB_CXX_PROJECT_NAME}
 	PROPERTY INCLUDE_DIRECTORIES
 		"${CMAKE_SOURCE_DIR}/src/lib_cxx"
+		"${CMAKE_SOURCE_DIR}/src/lib_utility"
 		"${CMAKE_SOURCE_DIR}/src/lib"
 )
 
@@ -279,15 +354,16 @@ target_include_directories(${LIB_CXX_PROJECT_NAME} SYSTEM
 )
 
 link_directories(${LLVM_LIBRARY_DIRS} ${CLANG_LIBRARY_DIRS} ${Boost_LIBRARY_DIRS})
-llvm_map_components_to_libnames(REQ_LLVM_LIBS support core libdriver passes)
+llvm_map_components_to_libnames(REQ_LLVM_LIBS support core libdriver passes x86asmparser x86codegen)
 
-target_link_libraries(${LIB_CXX_PROJECT_NAME} ${CLANG_LIBRARIES} ${REQ_LLVM_LIBS})
+target_link_libraries(${LIB_CXX_PROJECT_NAME} ${LIB_UTILITY_PROJECT_NAME} ${CLANG_LIBRARIES} ${REQ_LLVM_LIBS})
 
 if (WIN32)
 	target_link_libraries(${LIB_CXX_PROJECT_NAME} version)
 endif()
 
-# Lib Java -------------------------------------------------------------------
+
+# Lib Java ---------------------------------------------------------------------
 
 find_package(JNI)
 
@@ -301,6 +377,7 @@ set_property(
 	TARGET ${LIB_JAVA_PROJECT_NAME}
 	PROPERTY INCLUDE_DIRECTORIES
 		"${CMAKE_SOURCE_DIR}/src/lib_java"
+		"${CMAKE_SOURCE_DIR}/src/lib_utility"
 		"${CMAKE_SOURCE_DIR}/src/lib"
 		"${CMAKE_SOURCE_DIR}/src/lib_gui"
 )
@@ -312,7 +389,7 @@ target_include_directories(${LIB_JAVA_PROJECT_NAME} SYSTEM
 
 link_directories(${Boost_LIBRARY_DIRS})
 
-target_link_libraries(${LIB_JAVA_PROJECT_NAME} ${LIB_PROJECT_NAME})
+target_link_libraries(${LIB_JAVA_PROJECT_NAME} ${LIB_UTILITY_PROJECT_NAME} ${LIB_PROJECT_NAME})
 
 add_custom_command(
 	TARGET ${LIB_JAVA_PROJECT_NAME}
@@ -331,38 +408,6 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 # Instruct CMake to run moc automatically when needed.
 set(CMAKE_AUTOMOC ON)
 
-# Find the QtWidgets library
-if(UNIX)
-	set(CMAKE_PREFIX_PATH "$ENV{QT_DIR}/")
-
-	if(APPLE)
-		set(Qt5Widgets_DIR "$ENV{QT_DIR}/cmake/Qt5Widgets/")
-		set(Qt5PrintSupport_DIR "$ENV{QT_DIR}/cmake/Qt5PrintSupport/")
-	endif()
-
-else()
-	if(${WINXXBITS} STREQUAL "Win32")
-		set(CMAKE_PREFIX_PATH "$ENV{QT_WIN32_DIR}/")
-	else()
-		set(CMAKE_PREFIX_PATH "$ENV{QT_WIN64_DIR}/")
-	endif()
-	set(Qt5Widgets_DIR "${CMAKE_PREFIX_PATH}/lib/cmake/Qt5Widgets")
-	set(Qt5PrintSupport_DIR "${CMAKE_PREFIX_PATH}/lib/cmake/Qt5PrintSupport")
-	set(Qt5Network_DIR "${CMAKE_PREFIX_PATH}/lib/cmake/Qt5Network")
-endif()
-
-find_package(Qt5Widgets)
-find_package(Qt5PrintSupport)
-find_package(Qt5Network)
-
-if(Qt5Widgets_FOUND)
-	MESSAGE(STATUS "Found Qt ${Qt5Widgets_VERSION_STRING}")
-	# FIX: Qt was built with -reduce-relocations
-	if (Qt5_POSITION_INDEPENDENT_CODE)
-		SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
-	endif()
-endif()
-
 # target for running versionnumber script
 # workaround for running customcommand (ninja dependency cycle)
 add_custom_target(
@@ -371,7 +416,11 @@ add_custom_target(
 
 add_library(${LIB_GUI_PROJECT_NAME} ${LIB_GUI_FILES} ${CMAKE_BINARY_DIR}/src/lib_gui/version.h)
 
-target_link_libraries(${LIB_GUI_PROJECT_NAME} Qt5::Widgets Qt5::Network)
+if(UNIX)
+	target_link_libraries(${LIB_GUI_PROJECT_NAME} ${LIB_UTILITY_PROJECT_NAME} Qt5::Widgets Qt5::Network)
+else()
+	target_link_libraries(${LIB_GUI_PROJECT_NAME} ${LIB_UTILITY_PROJECT_NAME} Qt5::Widgets Qt5::Network Qt5::WinExtras)
+endif()
 
 # command for versioning script
 add_custom_command(
@@ -391,6 +440,7 @@ set_property(
 	TARGET ${LIB_GUI_PROJECT_NAME}
 	PROPERTY INCLUDE_DIRECTORIES
 		"${CMAKE_SOURCE_DIR}/src/lib_gui"
+		"${CMAKE_SOURCE_DIR}/src/lib_utility"
 		"${CMAKE_SOURCE_DIR}/src/lib"
 		"${CMAKE_SOURCE_DIR}/src/lib_cxx"
 		"${CMAKE_SOURCE_DIR}/src/lib_java"
@@ -422,6 +472,7 @@ include(cmake/public_key.cmake)
 
 set(CMAKE_AUTOMOC OFF)
 
+
 # Indexer App ------------------------------------------------------------------
 
 if (UNIX)
@@ -467,6 +518,7 @@ set_property(
 	PROPERTY INCLUDE_DIRECTORIES
 		"${CMAKE_SOURCE_DIR}/src/app"
 		"${CMAKE_SOURCE_DIR}/src/lib"
+		"${CMAKE_SOURCE_DIR}/src/lib_utility"
 		"${CMAKE_SOURCE_DIR}/src/lib_gui"
 		"${CMAKE_SOURCE_DIR}/src/lib_license"
 		"${CMAKE_SOURCE_DIR}/src/lib_cxx"
@@ -475,6 +527,7 @@ set_property(
 		"${CMAKE_BINARY_DIR}/src/lib_license"
 )
 
+
 # App --------------------------------------------------------------------------
 
 if (UNIX)
@@ -523,6 +576,7 @@ set_property(
 	PROPERTY INCLUDE_DIRECTORIES
 		"${CMAKE_SOURCE_DIR}/src/app"
 		"${CMAKE_SOURCE_DIR}/src/lib"
+		"${CMAKE_SOURCE_DIR}/src/lib_utility"
 		"${CMAKE_SOURCE_DIR}/src/lib_gui"
 		"${CMAKE_SOURCE_DIR}/src/lib_license"
 		"${CMAKE_SOURCE_DIR}/src/lib_cxx"
@@ -594,7 +648,8 @@ if (APPLE)
 
 endif ()
 
-# License Generator  --------------------------------------------------------
+
+# License Generator  -----------------------------------------------------------
 
 add_subdirectory(src/license_generator)
 
@@ -612,7 +667,7 @@ endif ()
 
 add_executable(${LICENSE_GENERATOR_PROJECT_NAME} ${LICENSE_GENERATOR_FILES} ${LICENSE_GENERATOR_MAIN})
 
-create_source_groups(${LICENSE_GENERATOR_FILES})
+create_source_groups(${LICENSE_GENERATOR_FILES} ${LICENSE_GENERATOR_MAIN})
 
 set_property(
 		TARGET ${LICENSE_GENERATOR_PROJECT_NAME}
@@ -633,6 +688,7 @@ endif()
 
 target_link_libraries(${LICENSE_GENERATOR_PROJECT_NAME} ${LIB_LICENSE_PROJECT_NAME} ${Boost_LIBRARIES} )
 
+
 # CxxTest ----------------------------------------------------------------------
 
 if (UNIX)
@@ -644,6 +700,10 @@ else ()
 	endforeach( OUTPUTCONFIG CMAKE_CONFIGURATION_TYPES )
 endif ()
 
+if (WIN32)
+	file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/test_main.cpp "")
+endif ()
+
 add_subdirectory(src/test)
 
 set(CXXTEST_INCLUDE_DIR $ENV{CXX_TEST_DIR})
@@ -666,6 +726,7 @@ if (CXXTEST_FOUND)
 		PROPERTY INCLUDE_DIRECTORIES
 			"${CXXTEST_INCLUDE_DIR}"
 			"${CMAKE_SOURCE_DIR}/src/lib"
+			"${CMAKE_SOURCE_DIR}/src/lib_utility"
 			"${CMAKE_SOURCE_DIR}/src/lib_gui"
 			"${CMAKE_SOURCE_DIR}/src/lib_cxx"
 			"${CMAKE_SOURCE_DIR}/src/lib_java"
@@ -708,6 +769,7 @@ elseif (UNIX)
 	add_dependencies(${TEST_PROJECT_NAME} gen)
 endif ()
 
+
 # Visual Leak Detector ---------------------------------------------------------
 
 if (WIN32)

README.md

@@ -5,19 +5,17 @@
 #### External Software
 
 * JDK 1.8
-* QT 5.9.1
+* QT 5.10.1
 * CxxTest 4.3
-* Clang & LLVM 4.0.1 (doesnt quite work for windows, use unix setup below and skip all the ninja stuff)(installation guide http://clang.llvm.org/docs/LibASTMatchersTutorial.html)
+* Clang & LLVM 6.0 (doesnt quite work for windows, use unix setup below and skip all the ninja stuff)(installation guide http://clang.llvm.org/docs/LibASTMatchersTutorial.html)
 * Boost 1.64
 * Botan 2.1.0
 * Image Magick 7.0.6
 * ccache (Unix)
+* Visual Leak Detector (Windows)
 * Wix 3.11 (Windows)
 * Winrar (Windows)
 
-also something about java, but who knows...
-
-
 #### Environment Variables
 
 * CXX_TEST_DIR - .../cxxtest-4.3
@@ -26,11 +24,11 @@ also something about java, but who knows...
 * BOTAN_DIR - .../Botan-2.1.0
 
 For MacOS and Linux
-* QT_DIR - .../Qt/Qt5.9.1/5.9.1/<IDE>
+* QT_DIR - .../Qt/Qt5.10.1/5.10.1/<IDE>
 
 For Windows:
-* QT_WIN32_DIR - .../Qt/Qt5.9.1/5.9.1/msvc2015<IDE>
-* QT_WIN64_DIR - .../Qt/Qt5.9.1/5.9.1/msvc2015_64<IDE>
+* QT_WIN32_DIR - .../Qt/Qt5.10.1/5.10.1/msvc2015
+* QT_WIN64_DIR - .../Qt/Qt5.10.1/5.10.1/msvc2015_64
 * VLD_DIR - .../Visual Leak Detector
 * JAVA_HOME - .../Java/jdk1.x.x_xxx
 * path

bin/app/data/color_schemes/bad_rainbow.xml

@@ -1,6 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <config>
+	<window>
+		<separator>#CCCCCC</separator>
+		<scrollbar>
+			<background>transparent</background>
+			<handle>#80999999</handle>
+			<line>#80999999</line>
+		</scrollbar>
+		<dock>
+			<text>white</text>
+			<background>#808080</background>
+			<line>#A0A0A0</line>
+			<icon_type>white</icon_type> <!-- white, grey, black -->
+		</dock>
+		<button>
+			<text>white</text>
+			<background>#CC494949</background>
+			<border>#D4D4D4</border>
+			<border_hover>white</border_hover>
+			<icon>white</icon>
+		</button>
+	</window>
+
 	<search>
 		<background>#494949</background>
 
@@ -15,7 +37,8 @@
 
 		<field>
 			<text>#FFFFFF</text>
-			<background>#808080</background>
+			<background>#494949</background>
+			<border>#808080</border>
 			<highlight>#B1B1B1</highlight>
 		</field>
 
@@ -72,10 +95,11 @@
 	</search>
 
 	<code>
-		<background>#494949</background>
+		<background>#595959</background>
 
 		<navigation>
-			<text>#A0A0A0</text>
+			<background>#494949</background>
+			<text>#CCCCCC</text>
 			<line>#CCCCCC</line>
 		</navigation>
 
@@ -222,7 +246,7 @@
 					<normal>#3D3D3D</normal>
 				</icon>
 				<hatching>
-					<normal>#494949</normal>
+					<normal>#616061</normal>
 				</hatching>
 			</default>
 
@@ -276,7 +300,7 @@
 					<focus>#FFFFFF</focus>
 				</border>
 				<hatching>
-					<normal>#FFFFFF</normal>
+					<normal>#FFE8A6</normal>
 				</hatching>
 			</function>
 			<method>
@@ -285,7 +309,7 @@
 
 			<global_variable>
 				<fill>
-					<normal>#00BCD6</normal>
+					<normal>#2FC2D6</normal>
 					<focus>#38D3E8</focus>
 				</fill>
 				<border>
@@ -293,7 +317,7 @@
 					<focus>#FFFFFF</focus>
 				</border>
 				<hatching>
-					<normal>#FFFFFF</normal>
+					<normal>#96DAE3</normal>
 				</hatching>
 			</global_variable>
 			<field>
@@ -303,9 +327,9 @@
 				<like>global_variable</like>
 			</enum_constant>
 
-			<non_indexed>
+			<symbol>
 				<like>type</like>
-			</non_indexed>
+			</symbol>
 			<namespace>
 				<fill>
 					<normal>#873E3E</normal>
@@ -320,6 +344,9 @@
 				<icon>
 					<normal>#FFFFFF</normal>
 				</icon>
+				<hatching>
+					<normal>#B05151</normal>
+				</hatching>
 			</namespace>
 			<package>
 				<like>namespace</like>
@@ -328,7 +355,7 @@
 			<file>
 				<fill>
 					<normal>#4E82F6</normal>
-					<focus>#7FA9F4</focus>
+					<focus>#6793F6</focus>
 				</fill>
 				<border>
 					<normal>#20FFFFFF</normal>
@@ -341,7 +368,7 @@
 					<normal>#FFFFFF</normal>
 				</icon>
 				<hatching>
-					<normal>#999999</normal>
+					<normal>#416CCC</normal>
 				</hatching>
 			</file>
 			<macro>
@@ -398,6 +425,51 @@
 					<normal>#B1B1B1</normal>
 				</text>
 			</text>
+			<group>
+				<default>
+					<fill>
+						<normal>transparent</normal>
+					</fill>
+					<text>
+						<normal>#FFFFFF</normal>
+					</text>
+					<border>
+						<normal>#807F80</normal>
+					</border>
+				</default>
+				<file>
+					<fill>
+						<normal>transparent</normal>
+					</fill>
+					<text>
+						<normal>#D4D4D4</normal>
+					</text>
+					<border>
+						<normal>#4E82F6</normal>
+						<focus>#6793F6</focus>
+					</border>
+				</file>
+				<namespace>
+					<fill>
+						<normal>transparent</normal>
+					</fill>
+					<text>
+						<normal>#D4D4D4</normal>
+					</text>
+					<border>
+						<normal>#873E3E</normal>
+						<focus>#944444</focus>
+					</border>
+				</namespace>
+				<inheritance>
+					<fill>
+						<normal>transparent</normal>
+					</fill>
+					<border>
+						<normal>#797979</normal>
+					</border>
+				</inheritance>
+			</group>
 		</node>
 		<edge>
 			<default>
@@ -405,7 +477,7 @@
 			</default>
 
 			<override>
-				<normal>#CC5E89</normal>
+				<normal>#BA5ECC</normal>
 			</override>
 
 			<call>
@@ -418,7 +490,7 @@
 			</use>
 
 			<template_argument>
-				<normal>#C1305D</normal>
+				<normal>#D93D5F</normal>
 			</template_argument>
 			<type_argument>
 				<like>template_argument</like>
@@ -449,9 +521,18 @@
 
 	<tab>
 		<background>#494949</background>
-		<active>#D4D4D4</active>
-		<hover>#878787</hover>
-		<text>#878787</text>
+		<bar>
+			<background>#808080</background>
+			<border>#BEBEBE</border>
+			<button>
+				<text>white</text>
+				<background>
+					<normal>#808080</normal>
+					<hover>#505050</hover>
+					<press>#494949</press>
+				</background>
+			</button>
+		</bar>
 	</tab>
 
 	<table>
@@ -473,10 +554,11 @@
 
 	<screen_search>
 		<background>#808080</background>
+		<border>#BEBEBE</border>
 		<box>
 			<background>#494949</background>
 			<text>#D4D4D4</text>
-			<match_label>#A0A0A0</match_label>
+			<match_label>#CCCCCC</match_label>
 		</box>
 		<filter>white</filter>
 		<button>

bin/app/data/color_schemes/bright.xml

@@ -1,6 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <config>
+	<window>
+		<separator>#A2A2A2</separator>
+		<scrollbar>
+			<background>transparent</background>
+			<handle>#80999999</handle>
+			<line>#80999999</line>
+		</scrollbar>
+		<dock>
+			<text>black</text>
+			<background>#E0E0E0</background>
+			<line>#BEBEBE</line>
+			<icon_type>grey</icon_type> <!-- white, grey, black -->
+		</dock>
+		<button>
+			<text>black</text>
+			<background>white</background>
+			<border>#AAA</border>
+			<border_hover>#878787</border_hover>
+			<icon>black</icon>
+		</button>
+	</window>
+
 	<search>
 		<background>white</background>
 
@@ -16,6 +38,7 @@
 		<field>
 			<text>black</text>
 			<background>#D0D0D0</background>
+			<border>#D0D0D0</border>
 			<highlight>#A2A2A2</highlight>
 		</field>
 
@@ -72,20 +95,21 @@
 	</search>
 
 	<code>
-		<background>white</background>
+		<background>#F6F6F6</background>
 
 		<navigation>
-			<text>#A2A2A2</text>
+			<background>white</background>
+			<text>#727272</text>
 			<line>#A2A2A2</line>
 		</navigation>
 
 		<file>
-			<background>#E0E0E0</background>
+			<background>#D0D0D0</background>
 
 			<title>
 				<text>black</text>
-				<normal>#E0E0E0</normal>
-				<hover>#C2C2C2</hover>
+				<normal>#D0D0D0</normal>
+				<hover>#B2B2B2</hover>
 				<press>#A2A2A2</press>
 				<icon>black</icon>
 				<border>white</border>
@@ -125,7 +149,7 @@
 				<comment>#6B9AB2</comment>
 				<number>#C1315E</number>
 				<quotation>#865F9E</quotation>
-				<function>#CC9533</function>
+				<function>#B0812C</function>
 			</syntax>
 
 			<selection>
@@ -208,7 +232,7 @@
 		<node>
 			<default>
 				<fill>
-					<normal>#ededed</normal>
+					<normal>#E6E6E6</normal>
 				</fill>
 				<border>
 					<normal>#3C3C3C</normal>
@@ -220,7 +244,7 @@
 					<normal>black</normal>
 				</icon>
 				<hatching>
-					<normal>white</normal>
+					<normal>#F5F5F5</normal>
 				</hatching>
 			</default>
 
@@ -267,6 +291,9 @@
 					<normal>transparent</normal>
 					<focus>#3C3C3C</focus>
 				</border>
+				<hatching>
+					<normal>#FFEDC4</normal>
+				</hatching>
 			</function>
 			<method>
 				<like>function</like>
@@ -281,6 +308,9 @@
 					<normal>transparent</normal>
 					<focus>#3C3C3C</focus>
 				</border>
+				<hatching>
+					<normal>#B3D4E5</normal>
+				</hatching>
 			</global_variable>
 			<field>
 				<like>global_variable</like>
@@ -289,9 +319,9 @@
 				<like>global_variable</like>
 			</enum_constant>
 
-			<non_indexed>
+			<symbol>
 				<like>type</like>
-			</non_indexed>
+			</symbol>
 			<namespace>
 				<fill>
 					<normal>#EFC5C5</normal>
@@ -303,6 +333,9 @@
 				<icon>
 					<normal>#3D3D3D</normal>
 				</icon>
+				<hatching>
+					<normal>#FFDEDE</normal>
+				</hatching>
 			</namespace>
 			<package>
 				<like>namespace</like>
@@ -317,6 +350,9 @@
 					<normal>#203C3C3C</normal>
 					<focus>#3C3C3C</focus>
 				</border>
+				<hatching>
+					<normal>#D7F7C8</normal>
+				</hatching>
 			</file>
 			<macro>
 				<like>file</like>
@@ -366,6 +402,48 @@
 					<normal>#A2A2A2</normal>
 				</text>
 			</text>
+			<group>
+				<default>
+					<fill>
+						<normal>transparent</normal>
+					</fill>
+					<border>
+						<normal>#D0D0D0</normal>
+					</border>
+				</default>
+				<file>
+					<fill>
+						<normal>transparent</normal>
+					</fill>
+					<text>
+						<normal>#5C5C5C</normal>
+					</text>
+					<border>
+						<normal>#BEE0AF</normal>
+						<focus>#A6D492</focus>
+					</border>
+				</file>
+				<namespace>
+					<fill>
+						<normal>transparent</normal>
+					</fill>
+					<text>
+						<normal>#5C5C5C</normal>
+					</text>
+					<border>
+						<normal>#EFC5C5</normal>
+						<focus>#EFB3B3</focus>
+					</border>
+				</namespace>
+				<inheritance>
+					<fill>
+						<normal>transparent</normal>
+					</fill>
+					<border>
+						<normal>#878787</normal>
+					</border>
+				</inheritance>
+			</group>
 		</node>
 		<edge>
 			<default>
@@ -373,7 +451,7 @@
 			</default>
 
 			<override>
-				<normal>#CC5E89</normal>
+				<normal>#A37ACC</normal>
 			</override>
 
 			<call>
@@ -386,7 +464,7 @@
 			</use>
 
 			<template_argument>
-				<normal>#C1305D</normal>
+				<normal>#CF6B7C</normal>
 			</template_argument>
 			<type_argument>
 				<like>template_argument</like>
@@ -410,9 +488,18 @@
 
 	<tab>
 		<background>white</background>
-		<active>black</active>
-		<hover>#878787</hover>
-		<text>#878787</text>
+		<bar>
+			<background>#E0E0E0</background>
+			<border>#BEBEBE</border>
+			<button>
+				<text>black</text>
+				<background>
+					<normal>#E0E0E0</normal>
+					<hover>#F0F0F0</hover>
+					<press>#FFFFFF</press>
+				</background>
+			</button>
+		</bar>
 	</tab>
 
 	<table>
@@ -434,10 +521,11 @@
 
 	<screen_search>
 		<background>#E0E0E0</background>
+		<border>#BEBEBE</border>
 		<box>
 			<background>white</background>
 			<text>black</text>
-			<match_label>#A0A0A0</match_label>
+			<match_label>#727272</match_label>
 		</box>
 		<filter>black</filter>
 		<button>

bin/app/data/color_schemes/dark.xml

@@ -1,13 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <config>
+	<window>
+		<separator>#CCC</separator>
+		<scrollbar>
+			<background>transparent</background>
+			<handle>#80999999</handle>
+			<line>#80999999</line>
+		</scrollbar>
+		<dock>
+			<text>#F7F7F7</text>
+			<background>#555555</background>
+			<line>#808080</line>
+			<icon_type>white</icon_type> <!-- white, grey, black -->
+		</dock>
+		<button>
+			<text>white</text>
+			<background>#3A3A3A</background>
+			<border>#C5C5C5</border>
+			<border_hover>white</border_hover>
+			<icon>white</icon>
+		</button>
+	</window>
+
 	<search>
 		<background>#272728</background>
 
 		<button>
-			<normal>#777777</normal>
-			<hover>#555555</hover>
-			<press>#444444</press>
+			<normal>#555555</normal>
+			<hover>#404040</hover>
+			<press>#3A3A3A</press>
 			<disabled>#333333</disabled>
 			<icon>white</icon>
 			<icon_disabled>#777777</icon_disabled>
@@ -15,8 +37,9 @@
 
 		<field>
 			<text>#F7F7F7</text>
-			<background>#777777</background>
-			<highlight>#555555</highlight>
+			<background>#272728</background>
+			<border>#555555</border>
+			<highlight>#999999</highlight>
 		</field>
 
 		<popup>
@@ -24,7 +47,7 @@
 			<by_text>#A0A0A0</by_text>
 			<background>#272728</background>
 			<highlight>#333333</highlight>
-			<line>#444444</line>
+			<line>#4A4A4A</line>
 		</popup>
 
 		<query>
@@ -72,21 +95,22 @@
 	</search>
 
 	<code>
-		<background>#272728</background>
+		<background>#313132</background>
 
 		<navigation>
-			<text>#A0A0A0</text>
+			<background>#272728</background>
+			<text>#C5C5C5</text>
 			<line>#CCC</line>
 		</navigation>
 
 		<file>
-			<background>#777777</background>
+			<background>#5C5C5C</background>
 
 			<title>
 				<text>#F7F7F7</text>
-				<normal>#777777</normal>
-				<hover>#555555</hover>
-				<press>#444444</press>
+				<normal>#5C5C5C</normal>
+				<hover>#4A4A4A</hover>
+				<press>#404040</press>
 				<icon>white</icon>
 				<border>#272728</border>
 				<hatching>dark</hatching>
@@ -211,7 +235,7 @@
 		<node>
 			<default>
 				<fill>
-					<normal>#4D4D4D</normal>
+					<normal>#5A5A5A</normal>
 				</fill>
 				<border>
 					<normal>#C3C3C3</normal>
@@ -223,7 +247,7 @@
 					<normal>#F7F7F7</normal>
 				</icon>
 				<hatching>
-					<normal>#272728</normal>
+					<normal>#3D3D3D</normal>
 				</hatching>
 			</default>
 
@@ -270,6 +294,9 @@
 					<normal>transparent</normal>
 					<focus>#C3C3C3</focus>
 				</border>
+				<hatching>
+					<normal>#544815</normal>
+				</hatching>
 			</function>
 			<method>
 				<like>function</like>
@@ -284,6 +311,9 @@
 					<normal>transparent</normal>
 					<focus>#C3C3C3</focus>
 				</border>
+				<hatching>
+					<normal>#17384A</normal>
+				</hatching>
 			</global_variable>
 			<field>
 				<like>global_variable</like>
@@ -292,9 +322,9 @@
 				<like>global_variable</like>>
 			</enum_constant>
 
-			<non_indexed>
+			<symbol>
 				<like>type</like>
-			</non_indexed>
+			</symbol>
 			<namespace>
 				<fill>
 					<normal>#78282D</normal>
@@ -306,6 +336,9 @@
 				<icon>
 					<normal>#C3C3C3</normal>
 				</icon>
+				<hatching>
+					<normal>#521B1F</normal>
+				</hatching>
 			</namespace>
 			<package>
 				<like>namespace</like>
@@ -314,12 +347,15 @@
 			<file>
 				<fill>
 					<normal>#1B564E</normal>
-					<focus>#247368</focus>
+					<focus>#21695F</focus>
 				</fill>
 				<border>
 					<normal>#20C3C3C3</normal>
 					<focus>#C3C3C3</focus>
 				</border>
+				<hatching>
+					<normal>#123B35</normal>
+				</hatching>
 			</file>
 			<macro>
 				<like>file</like>
@@ -369,6 +405,48 @@
 					<normal>#777777</normal>
 				</text>
 			</text>
+			<group>
+				<default>
+					<fill>
+						<normal>transparent</normal>
+					</fill>
+					<border>
+						<normal>#5A5A5A</normal>
+					</border>
+				</default>
+				<file>
+					<fill>
+						<normal>transparent</normal>
+					</fill>
+					<text>
+						<normal>#C3C3C3</normal>
+					</text>
+					<border>
+						<normal>#1B564E</normal>
+						<focus>#1E6158</focus>
+					</border>
+				</file>
+				<namespace>
+					<fill>
+						<normal>transparent</normal>
+					</fill>
+					<text>
+						<normal>#C3C3C3</normal>
+					</text>
+					<border>
+						<normal>#78282D</normal>
+						<focus>#872D33</focus>
+					</border>
+				</namespace>
+				<inheritance>
+					<fill>
+						<normal>transparent</normal>
+					</fill>
+					<border>
+						<normal>#797979</normal>
+					</border>
+				</inheritance>
+			</group>
 		</node>
 		<edge>
 			<default>
@@ -376,7 +454,7 @@
 			</default>
 
 			<override>
-				<normal>#CC5E89</normal>
+				<normal>#8A5A94</normal>
 			</override>
 
 			<call>
@@ -389,7 +467,7 @@
 			</use>
 
 			<template_argument>
-				<normal>#C1305D</normal>
+				<normal>#C14057</normal>
 			</template_argument>
 			<type_argument>
 				<like>template_argument</like>
@@ -420,20 +498,29 @@
 
 	<tab>
 		<background>#272728</background>
-		<active>white</active>
-		<hover>#878787</hover>
-		<text>#878787</text>
+		<bar>
+			<background>#555555</background>
+			<border>#BEBEBE</border>
+			<button>
+				<text>white</text>
+				<background>
+					<normal>#555555</normal>
+					<hover>#2F2F2F</hover>
+					<press>#272728</press>
+				</background>
+			</button>
+		</bar>
 	</tab>
 
 	<table>
 		<background>#272728</background>
-		<table>white</table>
+		<table>#C5C5C5</table>
 		<text>
 			<normal>white</normal>
 			<active>black</active>
 		</text>
 		<table_line_1>
-			<normal>darkgrey</normal>
+			<normal>#272728</normal>
 			<active>#969696</active>
 		</table_line_1>
 		<table_line_2>
@@ -443,11 +530,12 @@
 	</table>
 
 	<screen_search>
-		<background>#777777</background>
+		<background>#555555</background>
+		<border>#BEBEBE</border>
 		<box>
 			<background>#272728</background>
 			<text>#F7F7F7</text>
-			<match_label>#A0A0A0</match_label>
+			<match_label>#C5C5C5</match_label>
 		</box>
 		<filter>#F7F7F7</filter>
 		<button>

bin/app/data/fallback/window_settings.ini

@@ -1,8 +1,8 @@
 [General]
-DOCK_LOCATIONS=@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\x1\0\0\0\x2\0\0\x4\x83\0\0\x2\xb3\xfc\x1\0\0\0\x2\xfc\0\0\0\0\0\0\x4\x90\0\0\0\0\0\xff\xff\xff\xfc\x2\0\0\0\x1\xfb\0\0\0\xe\0\x44\0o\0\x63\0k\0L\0o\0g\0\0\0\x2\xc6\0\0\0\xc1\0\0\0\0\0\0\0\0\xfc\0\0\0\0\0\0\x4\x83\0\0\x2\x46\0\xff\xff\xff\xfc\x2\0\0\0\x2\xfc\0\0\0\x16\0\0\x2\xb3\0\0\0\xa3\0\xff\xff\xff\xfc\x1\0\0\0\x2\xfc\0\0\0\0\0\0\x2P\0\0\x1\x65\0\xff\xff\xff\xfc\x2\0\0\0\x2\xfb\0\0\0\x14\0\x44\0o\0\x63\0k\0S\0\x65\0\x61\0r\0\x63\0h\x1\0\0\0\x16\0\0\0M\0\0\0\x44\0\xff\xff\xff\xfb\0\0\0\x12\0\x44\0o\0\x63\0k\0G\0r\0\x61\0p\0h\x1\0\0\0g\0\0\x2\x62\0\0\0[\0\xff\xff\xff\xfb\0\0\0\x10\0\x44\0o\0\x63\0k\0\x43\0o\0\x64\0\x65\x1\0\0\x2T\0\0\x2/\0\0\0\xdd\0\xff\xff\xff\xfb\0\0\0\x14\0\x44\0o\0\x63\0k\0S\0t\0\x61\0t\0u\0s\0\0\0\x2I\0\0\0\xcb\0\0\0\xcb\0\xff\xff\xff\0\0\x4\x83\0\0\0\0\0\0\0\x4\0\0\0\x4\0\0\0\b\0\0\0\b\xfc\0\0\0\0)
+DOCK_LOCATIONS=@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\x1\0\0\0\x2\0\0\x4~\0\0\x2\xa1\xfc\x1\0\0\0\x2\xfc\0\0\0\0\0\0\x4\x90\0\0\0\0\0\xff\xff\xff\xfc\x2\0\0\0\x1\xfb\0\0\0\xe\0\x44\0o\0\x63\0k\0L\0o\0g\0\0\0\x2\xc6\0\0\0\xc1\0\0\0\0\0\0\0\0\xfc\0\0\0\0\0\0\x4~\0\0\x2[\0\xff\xff\xff\xfc\x2\0\0\0\x2\xfc\0\0\0\0\0\0\x2\xa1\0\0\0\x8c\0\xff\xff\xfe\xfc\x1\0\0\0\x2\xfc\0\0\0\0\0\0\x2\x84\0\0\x1z\0\xff\xff\xff\xfc\x2\0\0\0\x2\xfb\0\0\0\x14\0\x44\0o\0\x63\0k\0S\0\x65\0\x61\0r\0\x63\0h\x1\0\0\0\0\0\0\0-\0\0\0-\0\xff\xff\xfe\xfb\0\0\0\x12\0\x44\0o\0\x63\0k\0G\0r\0\x61\0p\0h\x1\0\0\0.\0\0\x2s\0\0\0G\0\xff\xff\xfe\xfb\0\0\0\x10\0\x44\0o\0\x63\0k\0\x43\0o\0\x64\0\x65\x1\0\0\x2\x85\0\0\x1\xf9\0\0\0\xe0\0\xff\xff\xff\xfb\0\0\0\x14\0\x44\0o\0\x63\0k\0S\0t\0\x61\0t\0u\0s\0\0\0\x2I\0\0\0\xcb\0\0\0\xa8\0\xff\xff\xfe\0\0\x4~\0\0\0\0\0\0\0\x4\0\0\0\x4\0\0\0\b\0\0\0\b\xfc\0\0\0\0)
 
 [MainWindow]
 maximized=false
-size=@Size(1200 800)
 position=@Point(80 50)
-showTitleBars=true
+showTitleBars=false
+size=@Size(1150 700)

bin/app/data/gui/code_view/code_view.css

@@ -1,13 +1,21 @@
-#code_navigation, #code_container, #code_file_list, #code_file_single {
+#code_container, #code_file_list {
 	background-color: <color:code/background>;
 }
 
+#code_file_single {
+	background-color: <color:code/snippet/background>;
+}
+
+#code_navigation {
+	background-color: <color:code/navigation/background>;
+}
+
 #code_container, #code_file_list {
 	border: none;
 }
 
 #separator_gap {
-	background-color: <color:code/background>;
+	background-color: <color:code/navigation/background>;
 	border: none;
 }
 
@@ -86,43 +94,53 @@
 	padding-bottom: 7px;
 }
 
-#code_file #title_widget {
+#title_bar, #title_bar_single {
 	background-color: <color:code/file/background>;
-	border-top-left-radius: 7px;
-	border-top-right-radius: 7px;
 	font-size: <setting:font_size>px;
+	border: none;
 }
 
-#code_file #title_label, #single_file_title_bar #file_title {
+#title_bar[hovering=false] {
+	border-top-left-radius: 7px;
+	border-top-right-radius: 7px;
+}
+
+#title_bar_single {
+	background-color: <color:code/file/background>;
+	padding-right: 5px;
+}
+
+#title_bar #screen_button, #title_bar_single #screen_button {
+	margin-right: 7px;
+}
+
+#title_button {
 	background-color: <color:code/file/title/normal>;
 	border: none;
 	border-radius: 3px;
 	color: <color:code/file/title/text>;
 	font-size: <setting:font_size>px;
 	padding: 2px 4px;
-}
-
-#code_file #title_label {
 	margin: 1px 8px;
 }
 
-#single_file_title_bar #file_title {
+#title_bar_single #title_button {
 	margin: 3px 8px;
 }
 
-#code_file #title_label:hover, #single_file_title_bar #file_title:hover {
+#title_button:hover {
 	background-color: <color:code/file/title/hover>;
 }
 
-#code_file #title_label:pressed, #single_file_title_bar #file_title:pressed {
+#title_button:pressed {
 	background-color: <color:code/file/title/press>;
 }
 
-#code_file #title_label[complete=false], #single_file_title_bar #file_title[complete=false] {
+#title_button[complete=false] {
 	border: 1px solid <color:code/file/title/border>;
 }
 
-#code_file #references_label, #single_file_title_bar #references_label {
+#references_label {
 	background-color: <color:code/file/ref_count/background>;
 	border: none;
 	border-radius: 10px;
@@ -170,13 +188,13 @@
 }
 
 #code_area {
-	background-color: transparent;
+	background-color: <color:code/snippet/background>;
 	color: <color:code/snippet/syntax/normal>;
 	selection-color: <color:code/snippet/selection/text>;
 	selection-background-color: <color:code/snippet/selection/background>;
 }
 
-#code_file #file_button {
+#title_bar #file_button, #title_bar_single #file_button {
 	background: transparent;
 	border: none;
 	margin: 3px;
@@ -184,11 +202,10 @@
 	max-width: 16px;
 }
 
-#code_file #file_button:enabled {
+#title_bar #file_button:enabled, #title_bar_single #file_button:enabled {
 	border-image: url(<setting:gui_path>code_view/images/button_background.png);
 }
 
-#single_file_title_bar {
-	background-color: <color:code/file/background>;
-	padding-right: 5px;
+#last_scroll_bar {
+	background-color: <color:code/snippet/background>;
 }

bin/app/data/gui/graph_view/graph_view.css

@@ -14,7 +14,7 @@ QPushButton:disabled {
 	background: <color:search/button/disabled>;
 }
 
-QPushButton:hover {
+QPushButton:hover, QPushButton:checked {
 	background: <color:search/button/hover>;
 }
 
@@ -25,6 +25,7 @@ QPushButton:pressed {
 #expand_button {
 	max-width: 26px;
 	max-height: 26px;
+	border-radius: 9px;
 }
 
 #collapse_button {
@@ -82,3 +83,21 @@ QPushButton:pressed {
 #depth_slider::groove:disabled, #depth_slider::handle:disabled {
 	background: <color:search/button/icon_disabled>;
 }
+
+#group_left_button {
+	border-radius: 0;
+	border-top-left-radius: 10px;
+	border-bottom-left-radius: 10px;
+	max-width: 26px;
+	max-height: 26px;
+	padding-left: 2px;
+}
+
+#group_right_button {
+	border-radius: 0;
+	border-top-right-radius: 10px;
+	border-bottom-right-radius: 10px;
+	max-width: 26px;
+	max-height: 26px;
+	padding-right: 2px;
+}

bin/app/data/gui/history_list/history_list.css

@@ -1,4 +1,4 @@
-#history_list {
+#history, #history_list {
 	background: <color:search/popup/background>;
 	border: none;
 }

bin/app/data/gui/indexing_dialog/indexing_dialog.css

@@ -1,4 +1,4 @@
-QLabel, QCheckBox {
+QLabel, QCheckBox, QRadioButton {
 	color: white;
 }
 
@@ -24,6 +24,15 @@ QLabel, QCheckBox {
 	font-weight: bold;
 }
 
+#option {
+	font-size: 14px;
+	margin-left: 15px;
+}
+
+#option:disabled {
+	color: #A0FFFFFF;
+}
+
 #filePath {
 	font-size: 11px;
 }

bin/app/data/gui/installer/EULA.rtf

@@ -1,6 +1,6 @@
-{\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff31507\deff0\stshfdbch31505\stshfloch31506\stshfhich31506\stshfbi31507\deflang1031\deflangfe1031\themelang1031\themelangfe0\themelangcs0{\fonttbl{\f0\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f2\fbidi \fmodern\fcharset0\fprq1{\*\panose 02070309020205020404}Courier New;}
-{\f3\fbidi \froman\fcharset2\fprq2{\*\panose 05050102010706020507}Symbol;}{\f4\fbidi \fswiss\fcharset0\fprq2{\*\panose 020b0604020202020204}Helvetica;}{\f10\fbidi \fnil\fcharset2\fprq2{\*\panose 05000000000000000000}Wingdings;}
-{\f34\fbidi \froman\fcharset0\fprq2{\*\panose 02040503050406030204}Cambria Math;}{\flomajor\f31500\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
+{\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff31507\deff0\stshfdbch31505\stshfloch31506\stshfhich31506\stshfbi0\deflang1031\deflangfe1031\themelang1031\themelangfe0\themelangcs0{\fonttbl{\f0\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f2\fbidi \fmodern\fcharset0\fprq1{\*\panose 02070309020205020404}Courier New;}
+{\f3\fbidi \froman\fcharset2\fprq2{\*\panose 05050102010706020507}Symbol;}{\f10\fbidi \fnil\fcharset2\fprq2{\*\panose 05000000000000000000}Wingdings;}{\f34\fbidi \froman\fcharset0\fprq2{\*\panose 02040503050406030204}Cambria Math;}
+{\f37\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}{\flomajor\f31500\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
 {\fdbmajor\f31501\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fhimajor\f31502\fbidi \froman\fcharset0\fprq2{\*\panose 02040503050406030204}Cambria;}
 {\fbimajor\f31503\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\flominor\f31504\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
 {\fdbminor\f31505\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fhiminor\f31506\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}
@@ -8,46 +8,47 @@
 {\f42\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\f43\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\f44\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\f45\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}
 {\f46\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\f47\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f59\fbidi \fmodern\fcharset238\fprq1 Courier New CE;}{\f60\fbidi \fmodern\fcharset204\fprq1 Courier New Cyr;}
 {\f62\fbidi \fmodern\fcharset161\fprq1 Courier New Greek;}{\f63\fbidi \fmodern\fcharset162\fprq1 Courier New Tur;}{\f64\fbidi \fmodern\fcharset177\fprq1 Courier New (Hebrew);}{\f65\fbidi \fmodern\fcharset178\fprq1 Courier New (Arabic);}
-{\f66\fbidi \fmodern\fcharset186\fprq1 Courier New Baltic;}{\f67\fbidi \fmodern\fcharset163\fprq1 Courier New (Vietnamese);}{\f79\fbidi \fswiss\fcharset238\fprq2 Helvetica CE;}{\f80\fbidi \fswiss\fcharset204\fprq2 Helvetica Cyr;}
-{\f82\fbidi \fswiss\fcharset161\fprq2 Helvetica Greek;}{\f83\fbidi \fswiss\fcharset162\fprq2 Helvetica Tur;}{\f84\fbidi \fswiss\fcharset177\fprq2 Helvetica (Hebrew);}{\f85\fbidi \fswiss\fcharset178\fprq2 Helvetica (Arabic);}
-{\f86\fbidi \fswiss\fcharset186\fprq2 Helvetica Baltic;}{\f87\fbidi \fswiss\fcharset163\fprq2 Helvetica (Vietnamese);}{\f379\fbidi \froman\fcharset238\fprq2 Cambria Math CE;}{\f380\fbidi \froman\fcharset204\fprq2 Cambria Math Cyr;}
+{\f66\fbidi \fmodern\fcharset186\fprq1 Courier New Baltic;}{\f67\fbidi \fmodern\fcharset163\fprq1 Courier New (Vietnamese);}{\f379\fbidi \froman\fcharset238\fprq2 Cambria Math CE;}{\f380\fbidi \froman\fcharset204\fprq2 Cambria Math Cyr;}
 {\f382\fbidi \froman\fcharset161\fprq2 Cambria Math Greek;}{\f383\fbidi \froman\fcharset162\fprq2 Cambria Math Tur;}{\f386\fbidi \froman\fcharset186\fprq2 Cambria Math Baltic;}{\f387\fbidi \froman\fcharset163\fprq2 Cambria Math (Vietnamese);}
-{\flomajor\f31508\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\flomajor\f31509\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\flomajor\f31511\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}
-{\flomajor\f31512\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\flomajor\f31513\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\flomajor\f31514\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}
-{\flomajor\f31515\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\flomajor\f31516\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fdbmajor\f31518\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}
-{\fdbmajor\f31519\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fdbmajor\f31521\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fdbmajor\f31522\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}
-{\fdbmajor\f31523\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fdbmajor\f31524\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fdbmajor\f31525\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}
-{\fdbmajor\f31526\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fhimajor\f31528\fbidi \froman\fcharset238\fprq2 Cambria CE;}{\fhimajor\f31529\fbidi \froman\fcharset204\fprq2 Cambria Cyr;}
-{\fhimajor\f31531\fbidi \froman\fcharset161\fprq2 Cambria Greek;}{\fhimajor\f31532\fbidi \froman\fcharset162\fprq2 Cambria Tur;}{\fhimajor\f31535\fbidi \froman\fcharset186\fprq2 Cambria Baltic;}
-{\fhimajor\f31536\fbidi \froman\fcharset163\fprq2 Cambria (Vietnamese);}{\fbimajor\f31538\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fbimajor\f31539\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
-{\fbimajor\f31541\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbimajor\f31542\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fbimajor\f31543\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
-{\fbimajor\f31544\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fbimajor\f31545\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fbimajor\f31546\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}
-{\flominor\f31548\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\flominor\f31549\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\flominor\f31551\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}
-{\flominor\f31552\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\flominor\f31553\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\flominor\f31554\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}
-{\flominor\f31555\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\flominor\f31556\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fdbminor\f31558\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}
-{\fdbminor\f31559\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fdbminor\f31561\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fdbminor\f31562\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}
-{\fdbminor\f31563\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fdbminor\f31564\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fdbminor\f31565\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}
-{\fdbminor\f31566\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fhiminor\f31568\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}{\fhiminor\f31569\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;}
-{\fhiminor\f31571\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\fhiminor\f31572\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;}{\fhiminor\f31575\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;}
-{\fhiminor\f31576\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese);}{\fbiminor\f31578\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fbiminor\f31579\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
-{\fbiminor\f31581\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbiminor\f31582\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fbiminor\f31583\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
-{\fbiminor\f31584\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fbiminor\f31585\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fbiminor\f31586\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}}
-{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;
-\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;}{\*\defchp \fs22\loch\af31506\hich\af31506\dbch\af31505 }{\*\defpap \ql \li0\ri0\sa200\sl276\slmult1
-\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 }\noqfpromote {\stylesheet{\ql \li0\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af31507\afs22\alang1025 
-\ltrch\fcs0 \fs22\lang1031\langfe1031\loch\f31506\hich\af31506\dbch\af31505\cgrid\langnp1031\langfenp1031 \snext0 \sqformat \spriority0 Normal;}{\*\cs10 \additive \ssemihidden \sunhideused \spriority1 Default Paragraph Font;}{\*
+{\f409\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}{\f410\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;}{\f412\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\f413\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;}
+{\f416\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;}{\f417\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese);}{\flomajor\f31508\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}
+{\flomajor\f31509\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\flomajor\f31511\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\flomajor\f31512\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}
+{\flomajor\f31513\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\flomajor\f31514\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\flomajor\f31515\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}
+{\flomajor\f31516\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fdbmajor\f31518\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fdbmajor\f31519\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
+{\fdbmajor\f31521\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fdbmajor\f31522\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fdbmajor\f31523\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
+{\fdbmajor\f31524\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fdbmajor\f31525\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fdbmajor\f31526\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}
+{\fhimajor\f31528\fbidi \froman\fcharset238\fprq2 Cambria CE;}{\fhimajor\f31529\fbidi \froman\fcharset204\fprq2 Cambria Cyr;}{\fhimajor\f31531\fbidi \froman\fcharset161\fprq2 Cambria Greek;}{\fhimajor\f31532\fbidi \froman\fcharset162\fprq2 Cambria Tur;}
+{\fhimajor\f31535\fbidi \froman\fcharset186\fprq2 Cambria Baltic;}{\fhimajor\f31536\fbidi \froman\fcharset163\fprq2 Cambria (Vietnamese);}{\fbimajor\f31538\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}
+{\fbimajor\f31539\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fbimajor\f31541\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbimajor\f31542\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}
+{\fbimajor\f31543\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fbimajor\f31544\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fbimajor\f31545\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}
+{\fbimajor\f31546\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\flominor\f31548\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\flominor\f31549\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
+{\flominor\f31551\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\flominor\f31552\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\flominor\f31553\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
+{\flominor\f31554\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\flominor\f31555\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\flominor\f31556\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}
+{\fdbminor\f31558\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fdbminor\f31559\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fdbminor\f31561\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}
+{\fdbminor\f31562\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fdbminor\f31563\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fdbminor\f31564\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}
+{\fdbminor\f31565\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fdbminor\f31566\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fhiminor\f31568\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}
+{\fhiminor\f31569\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;}{\fhiminor\f31571\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\fhiminor\f31572\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;}
+{\fhiminor\f31575\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;}{\fhiminor\f31576\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese);}{\fbiminor\f31578\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}
+{\fbiminor\f31579\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fbiminor\f31581\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbiminor\f31582\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}
+{\fbiminor\f31583\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fbiminor\f31584\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fbiminor\f31585\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}
+{\fbiminor\f31586\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}}{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;
+\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;}{\*\defchp 
+\fs22\loch\af31506\hich\af31506\dbch\af31505 }{\*\defpap \ql \li0\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 }\noqfpromote {\stylesheet{\ql \li0\ri0\sa200\sl276\slmult1
+\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 \fs22\lang1031\langfe1031\loch\f31506\hich\af31506\dbch\af31505\cgrid\langnp1031\langfenp1031 \snext0 \sqformat \spriority0 Normal;}
+{\*\cs10 \additive \ssemihidden \sunhideused \spriority1 Default Paragraph Font;}{\*
 \ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\trcbpat1\trcfpat1\tblind0\tblindtype3\tscellwidthfts0\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv \ql \li0\ri0\sa200\sl276\slmult1
-\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 \fs22\lang1031\langfe1031\loch\f31506\hich\af31506\dbch\af31505\cgrid\langnp1031\langfenp1031 
-\snext11 \ssemihidden \sunhideused \sqformat Normal Table;}}{\*\listtable{\list\listtemplateid-193139844\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext
-\leveltemplateid67567617\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li720\lin720 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
-\leveltemplateid67567619\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567621
-\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567617
-\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567619
-\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567621
-\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567617
-\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567619
-\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567621
-\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6480\lin6480 }{\listname ;}\listid27729033}{\list\listtemplateid300595816\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360
+\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs22\alang1025 \ltrch\fcs0 \fs22\lang1031\langfe1031\loch\f31506\hich\af31506\dbch\af31505\cgrid\langnp1031\langfenp1031 
+\snext11 \ssemihidden \sunhideused \sqformat Normal Table;}{\s15\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 
+\fs22\lang1031\langfe1031\loch\f31506\hich\af31506\dbch\af31505\cgrid\langnp1031\langfenp1031 \snext15 \sqformat \spriority1 \styrsid2585574 No Spacing;}}{\*\listtable{\list\listtemplateid-193139844\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0
+\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid67567617\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li720\lin720 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0
+\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567619\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative
+\levelspace360\levelindent0{\leveltext\leveltemplateid67567621\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360
+\levelindent0{\leveltext\leveltemplateid67567617\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0
+{\leveltext\leveltemplateid67567619\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567621\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567617\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567619\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567621
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6480\lin6480 }{\listname ;}\listid27729033}{\list\listtemplateid1375513438\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360
 \levelindent0{\leveltext\leveltemplateid67567617\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li720\lin720 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0
 {\leveltext\leveltemplateid67567619\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
 \leveltemplateid67567621\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
@@ -56,7 +57,7 @@
 \'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567617
 \'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567619
 \'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567621
-\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6480\lin6480 }{\listname ;}\listid253251691}{\list\listtemplateid-1917002558\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6480\lin6480 }{\listname ;}\listid96100686}{\list\listtemplateid300595816\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360
 \levelindent0{\leveltext\leveltemplateid67567617\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li720\lin720 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0
 {\leveltext\leveltemplateid67567619\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
 \leveltemplateid67567621\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
@@ -65,7 +66,7 @@
 \'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567617
 \'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567619
 \'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567621
-\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6480\lin6480 }{\listname ;}\listid731805719}{\list\listtemplateid-331980480\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6480\lin6480 }{\listname ;}\listid253251691}{\list\listtemplateid76031560\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360
 \levelindent0{\leveltext\leveltemplateid67567617\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li720\lin720 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0
 {\leveltext\leveltemplateid67567619\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
 \leveltemplateid67567621\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
@@ -74,7 +75,7 @@
 \'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567617
 \'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567619
 \'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567621
-\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6480\lin6480 }{\listname ;}\listid846598160}{\list\listtemplateid2109785220\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6480\lin6480 }{\listname ;}\listid300041076}{\list\listtemplateid-1730514658\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360
 \levelindent0{\leveltext\leveltemplateid67567617\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li720\lin720 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0
 {\leveltext\leveltemplateid67567619\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
 \leveltemplateid67567621\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
@@ -83,7 +84,7 @@
 \'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567617
 \'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567619
 \'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567621
-\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6480\lin6480 }{\listname ;}\listid1207254615}{\list\listtemplateid2097152234\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6480\lin6480 }{\listname ;}\listid311452362}{\list\listtemplateid1740521432\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360
 \levelindent0{\leveltext\leveltemplateid67567617\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li720\lin720 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0
 {\leveltext\leveltemplateid67567619\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
 \leveltemplateid67567621\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
@@ -92,203 +93,454 @@
 \'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567617
 \'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567619
 \'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567621
-\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6480\lin6480 }{\listname ;}\listid1638951864}}{\*\listoverridetable{\listoverride\listid846598160\listoverridecount0\ls1}{\listoverride\listid253251691\listoverridecount0\ls2}
-{\listoverride\listid731805719\listoverridecount0\ls3}{\listoverride\listid1638951864\listoverridecount0\ls4}{\listoverride\listid1207254615\listoverridecount0\ls5}{\listoverride\listid27729033\listoverridecount0\ls6}}{\*\rsidtbl \rsid3083065\rsid5338747}
-{\mmathPr\mmathFont34\mbrkBin0\mbrkBinSub0\msmallFrac0\mdispDef1\mlMargin0\mrMargin0\mdefJc1\mwrapIndent1440\mintLim0\mnaryLim1}{\info{\author Thomson, Clive}{\operator Malte Langkabel}{\creatim\yr2017\mo6\dy20\hr14}{\revtim\yr2017\mo6\dy20\hr14\min8}
-{\version3}{\edmins0}{\nofpages4}{\nofwords1481}{\nofchars8026}{\*\company CSR}{\nofcharsws9489}{\vern32859}}{\*\xmlnstbl {\xmlns1 http://schemas.microsoft.com/office/word/2003/wordml}}
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6480\lin6480 }{\listname ;}\listid329989798}{\list\listtemplateid-2138013748\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360
+\levelindent0{\leveltext\leveltemplateid67567617\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li720\lin720 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0
+{\leveltext\leveltemplateid67567619\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567621\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567617\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567619\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567621
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567617
+\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567619
+\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567621
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6480\lin6480 }{\listname ;}\listid337853658}{\list\listtemplateid-1979967268\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360
+\levelindent0{\leveltext\leveltemplateid67567617\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li720\lin720 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0
+{\leveltext\leveltemplateid67567619\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567621\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567617\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567619\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567621
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567617
+\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567619
+\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567621
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6480\lin6480 }{\listname ;}\listid407533594}{\list\listtemplateid-2064771084\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360
+\levelindent0{\leveltext\leveltemplateid67567617\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li720\lin720 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0
+{\leveltext\leveltemplateid67567619\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567621\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567617\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567619\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567621
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567617
+\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567619
+\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567621
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6480\lin6480 }{\listname ;}\listid520895476}{\list\listtemplateid266901952\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360
+\levelindent0{\leveltext\leveltemplateid67567617\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li720\lin720 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0
+{\leveltext\leveltemplateid67567619\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567621\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567617\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567619\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567621
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567617
+\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567619
+\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567621
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6480\lin6480 }{\listname ;}\listid559290299}{\list\listtemplateid1270663972\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360
+\levelindent0{\leveltext\leveltemplateid67567617\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li720\lin720 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0
+{\leveltext\leveltemplateid67567619\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567621\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567617\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567619\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567621
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567617
+\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567619
+\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567621
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6480\lin6480 }{\listname ;}\listid578827701}{\list\listtemplateid1940422034\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360
+\levelindent0{\leveltext\leveltemplateid67567617\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li720\lin720 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0
+{\leveltext\leveltemplateid67567619\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567621\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567617\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567619\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567621
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567617
+\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567619
+\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567621
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6480\lin6480 }{\listname ;}\listid611281618}{\list\listtemplateid-116596600\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360
+\levelindent0{\leveltext\leveltemplateid67567617\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li720\lin720 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0
+{\leveltext\leveltemplateid67567619\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567621\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567617\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567619\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567621
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567617
+\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567619
+\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567621
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6480\lin6480 }{\listname ;}\listid720053339}{\list\listtemplateid-1917002558\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360
+\levelindent0{\leveltext\leveltemplateid67567617\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li720\lin720 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0
+{\leveltext\leveltemplateid67567619\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567621\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567617\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567619\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567621
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567617
+\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567619
+\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567621
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6480\lin6480 }{\listname ;}\listid731805719}{\list\listtemplateid2071086706\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360
+\levelindent0{\leveltext\leveltemplateid67567617\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li720\lin720 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0
+{\leveltext\leveltemplateid67567619\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567621\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567617\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567619\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567621
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567617
+\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567619
+\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567621
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6480\lin6480 }{\listname ;}\listid777916200}{\list\listtemplateid-331980480\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360
+\levelindent0{\leveltext\leveltemplateid67567617\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li720\lin720 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0
+{\leveltext\leveltemplateid67567619\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567621\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567617\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567619\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567621
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567617
+\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567619
+\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567621
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6480\lin6480 }{\listname ;}\listid846598160}{\list\listtemplateid-1896473156\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360
+\levelindent0{\leveltext\leveltemplateid67567617\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li720\lin720 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0
+{\leveltext\leveltemplateid67567619\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567621\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567617\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567619\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567621
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567617
+\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567619
+\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567621
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6480\lin6480 }{\listname ;}\listid929775564}{\list\listtemplateid-1405195412\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360
+\levelindent0{\leveltext\leveltemplateid67567617\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li720\lin720 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0
+{\leveltext\leveltemplateid67567619\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567621\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567617\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567619\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567621
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567617
+\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567619
+\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567621
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6480\lin6480 }{\listname ;}\listid936400082}{\list\listtemplateid1352454040\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360
+\levelindent0{\leveltext\leveltemplateid67567617\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li720\lin720 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0
+{\leveltext\leveltemplateid67567619\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567621\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567617\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567619\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567621
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567617
+\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567619
+\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567621
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6480\lin6480 }{\listname ;}\listid1164903365}{\list\listtemplateid2109785220\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360
+\levelindent0{\leveltext\leveltemplateid67567617\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li720\lin720 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0
+{\leveltext\leveltemplateid67567619\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567621\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567617\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567619\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567621
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567617
+\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567619
+\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567621
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6480\lin6480 }{\listname ;}\listid1207254615}{\list\listtemplateid-1006051000\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360
+\levelindent0{\leveltext\leveltemplateid67567617\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li720\lin720 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0
+{\leveltext\leveltemplateid67567619\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567621\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567617\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567619\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567621
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567617
+\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567619
+\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567621
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6480\lin6480 }{\listname ;}\listid1352025351}{\list\listtemplateid-204324422\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360
+\levelindent0{\leveltext\leveltemplateid67567617\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li720\lin720 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0
+{\leveltext\leveltemplateid67567619\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567621\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567617\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567619\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567621
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567617
+\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567619
+\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567621
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6480\lin6480 }{\listname ;}\listid1380668622}{\list\listtemplateid948060056\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360
+\levelindent0{\leveltext\leveltemplateid67567617\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li720\lin720 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0
+{\leveltext\leveltemplateid67567619\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567621\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567617\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567619\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567621
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567617
+\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567619
+\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567621
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6480\lin6480 }{\listname ;}\listid1422531975}{\list\listtemplateid1664367632\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360
+\levelindent0{\leveltext\leveltemplateid67567617\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li720\lin720 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0
+{\leveltext\leveltemplateid67567619\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567621\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567617\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567619\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567621
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567617
+\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567619
+\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567621
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6480\lin6480 }{\listname ;}\listid1447502227}{\list\listtemplateid-1464407968\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360
+\levelindent0{\leveltext\leveltemplateid67567617\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li720\lin720 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0
+{\leveltext\leveltemplateid67567619\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567621\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567617\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567619\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567621
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567617
+\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567619
+\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567621
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6480\lin6480 }{\listname ;}\listid1509439923}{\list\listtemplateid2097152234\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360
+\levelindent0{\leveltext\leveltemplateid67567617\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li720\lin720 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0
+{\leveltext\leveltemplateid67567619\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567621\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567617\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567619\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567621
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567617
+\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567619
+\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567621
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6480\lin6480 }{\listname ;}\listid1638951864}{\list\listtemplateid248937908\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360
+\levelindent0{\leveltext\leveltemplateid67567617\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li720\lin720 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0
+{\leveltext\leveltemplateid67567619\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567621\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567617\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
+\leveltemplateid67567619\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567621
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567617
+\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567619
+\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67567621
+\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6480\lin6480 }{\listname ;}\listid1951863245}}{\*\listoverridetable{\listoverride\listid846598160\listoverridecount0\ls1}{\listoverride\listid253251691\listoverridecount0\ls2}
+{\listoverride\listid731805719\listoverridecount0\ls3}{\listoverride\listid1638951864\listoverridecount0\ls4}{\listoverride\listid1207254615\listoverridecount0\ls5}{\listoverride\listid27729033\listoverridecount0\ls6}{\listoverride\listid611281618
+\listoverridecount0\ls7}{\listoverride\listid1352025351\listoverridecount0\ls8}{\listoverride\listid1380668622\listoverridecount0\ls9}{\listoverride\listid936400082\listoverridecount0\ls10}{\listoverride\listid1447502227\listoverridecount0\ls11}
+{\listoverride\listid300041076\listoverridecount0\ls12}{\listoverride\listid578827701\listoverridecount0\ls13}{\listoverride\listid520895476\listoverridecount0\ls14}{\listoverride\listid1164903365\listoverridecount0\ls15}{\listoverride\listid929775564
+\listoverridecount0\ls16}{\listoverride\listid777916200\listoverridecount0\ls17}{\listoverride\listid337853658\listoverridecount0\ls18}{\listoverride\listid1509439923\listoverridecount0\ls19}{\listoverride\listid96100686\listoverridecount0\ls20}
+{\listoverride\listid720053339\listoverridecount0\ls21}{\listoverride\listid1422531975\listoverridecount0\ls22}{\listoverride\listid329989798\listoverridecount0\ls23}{\listoverride\listid311452362\listoverridecount0\ls24}{\listoverride\listid559290299
+\listoverridecount0\ls25}{\listoverride\listid407533594\listoverridecount0\ls26}{\listoverride\listid1951863245\listoverridecount0\ls27}}{\*\rsidtbl \rsid2585574\rsid3083065\rsid5248660\rsid5338747\rsid9004326\rsid9579172\rsid10582864\rsid14037707}
+{\mmathPr\mmathFont34\mbrkBin0\mbrkBinSub0\msmallFrac0\mdispDef1\mlMargin0\mrMargin0\mdefJc1\mwrapIndent1440\mintLim0\mnaryLim1}{\info{\author Thomson, Clive}{\operator Malte}{\creatim\yr2017\mo6\dy20\hr14}{\revtim\yr2018\mo4\dy6\hr15\min25}{\version9}
+{\edmins0}{\nofpages5}{\nofwords1677}{\nofchars10570}{\*\company CSR}{\nofcharsws12223}{\vern32859}}{\*\xmlnstbl {\xmlns1 http://schemas.microsoft.com/office/word/2003/wordml}}
 \paperw12240\paperh15840\margl1440\margr1440\margt1417\margb1134\gutter0\ltrsect 
 \widowctrl\ftnbj\aenddoc\hyphhotz425\trackmoves1\trackformatting1\donotembedsysfont0\relyonvml0\donotembedlingdata1\grfdocevents0\validatexml0\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0\showxmlerrors0\horzdoc\dghspace120\dgvspace120
 \dghorigin1701\dgvorigin1984\dghshow0\dgvshow3\jcompress\viewkind1\viewscale100\rsidroot3083065 \fet0{\*\wgrffmtfilter 2450}\ilfomacatclnup0\ltrpar \sectd \ltrsect\linex0\sectdefaultcl\sftnbj {\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}}
 {\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}
 {\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl9
-\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}\pard\plain \ltrpar\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 
-\fs22\lang1031\langfe1031\loch\af31506\hich\af31506\dbch\af31505\cgrid\langnp1031\langfenp1031 {\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid3083065 \hich\af4\dbch\af31505\loch\f4 Sourcetrail
-\par \hich\af4\dbch\af31505\loch\f4 \hich\f4 Software License Agreement (\'93\loch\f4 \hich\f4 AGREEMENT\'94\loch\f4 )
-\par \hich\af4\dbch\af31505\loch\f4 Last date of change: 2017-06-19
+\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}\pard\plain \ltrpar\s15\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid2585574 \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 
+\fs22\lang1031\langfe1031\loch\af31506\hich\af31506\dbch\af31505\cgrid\langnp1031\langfenp1031 {\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \hich\af31506\dbch\af31505\loch\f31506 Sourcetrail
+\par \hich\af31506\dbch\af31505\loch\f31506 \hich\f31506 Software License Agreement (\'93\loch\f31506 \hich\f31506 AGREEMENT\'94\loch\f31506 )
+\par \hich\af31506\dbch\af31505\loch\f31506 Last date of change: 2018-0}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1033\langfe1031\langnp1033\insrsid2585574 \hich\af31506\dbch\af31505\loch\f31506 4}{\rtlch\fcs1 \af31507 \ltrch\fcs0 
+\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 -}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1033\langfe1031\langnp1033\insrsid2585574 \hich\af31506\dbch\af31505\loch\f31506 06}{\rtlch\fcs1 \af31507 \ltrch\fcs0 
+\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 
 \par 
-\par \hich\af4\dbch\af31505\loch\f4 BY INSTALLING OR USING THIS SOFTWARE, YOU ARE BECOMING A PARTY TO, AND ARE CO\hich\af4\dbch\af31505\loch\f4 
-NSENTING TO BE BOUND BY, THIS AGREEMENT. IF YOU DO NOT AGREE TO ALL OF THE TERMS OF THIS AGREEMENT, DO NOT INSTALL OR USE THIS SOFTWARE.
+\par \hich\af31506\dbch\af31505\loch\f31506 BY INSTALLING OR USING THIS SOFTWARE, YOU ARE BECOM\hich\af31506\dbch\af31505\loch\f31506 
+ING A PARTY TO, AND ARE CONSENTING TO BE BOUND BY, THIS AGREEMENT. IF YOU DO NOT AGREE TO ALL OF THE TERMS OF THIS AGREEMENT, DO NOT INSTALL OR USE THIS SOFTWARE.
 \par 
 \par 
-\par }{\rtlch\fcs1 \af4 \ltrch\fcs0 \b\f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid5338747 \hich\af4\dbch\af31505\loch\f4 DEFINITIONS
-\par }{\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid3083065 
-\par \hich\af4\dbch\af31505\loch\f4 "SOFTWARE" means:}{\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\insrsid5338747 
-\par {\listtext\pard\plain\ltrpar \rtlch\fcs1 \af4\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\charrsid3083065 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}}\pard \ltrpar
-\ql \fi-360\li720\ri0\nowidctlpar\wrapdefault\faauto\ls1\rin0\lin720\itap0\pararsid5338747 {\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid3083065 \hich\af4\dbch\af31505\loch\f4 
-A version of the cross-platform source code explorer known as Sourcetrail in executa\hich\af4\dbch\af31505\loch\f4 
-ble form. The version is defined by the two leading numbers of the version string (e.g. the version of Sourcetrail 2017.1.x is version 2017.1);}{\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\lang1033\langfe1031\langnp1033\insrsid5338747 
-\par {\listtext\pard\plain\ltrpar \rtlch\fcs1 \af4\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\charrsid5338747 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}}{\rtlch\fcs1 \af4 \ltrch\fcs0 
-\f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid5338747 \hich\af4\dbch\af31505\loch\f4 documentation for that version of Sourcetrail;}{\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\lang1033\langfe1031\langnp1033\insrsid5338747 
-\par {\listtext\pard\plain\ltrpar \rtlch\fcs1 \af4\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\charrsid5338747 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}}{\rtlch\fcs1 \af4 \ltrch\fcs0 
-\f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid5338747 \hich\af4\dbch\af31505\loch\f4 minor updates included in software maintenance which are indi\hich\af4\dbch\af31505\loch\f4 
-cated by an increase in the digits that follow the first two leading numbers of the version string (e.g. the update from Sourcetrail 2017.1.0 to Sourcetrail 2017.1.1 is a minor update).
-\par }\pard \ltrpar\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 {\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid3083065 \hich\af4\dbch\af31505\loch\f4 "LICENSE" means:
-\par {\listtext\pard\plain\ltrpar \rtlch\fcs1 \af4\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\charrsid3083065 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}}\pard \ltrpar
-\ql \fi-360\li720\ri0\nowidctlpar\wrapdefault\faauto\ls2\rin0\lin720\itap0\pararsid5338747 {\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid3083065 \hich\af4\dbch\af31505\loch\f4 
-the permission to use, reproduction and distributio\hich\af4\dbch\af31505\loch\f4 n of the SOFTWARE as defined by the following sections of this document.
-\par }\pard \ltrpar\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 {\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid3083065 \hich\af4\dbch\af31505\loch\f4 "LICENSOR" means:
-\par {\listtext\pard\plain\ltrpar \rtlch\fcs1 \af4\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\charrsid3083065 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}}\pard \ltrpar
-\ql \fi-360\li720\ri0\nowidctlpar\wrapdefault\faauto\ls2\rin0\lin720\itap0\pararsid5338747 {\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid3083065 \hich\af4\dbch\af31505\loch\f4 \hich\f4 
-Coati Software OG, having a place of business at Jakob-Haringer-Stra\'df\loch\f4 e 1/127, 5020 Salzburg, Austria.
-\par }\pard \ltrpar\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 {\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid3083065 \hich\af4\dbch\af31505\loch\f4 "LICENSEE" means:
-\par {\listtext\pard\plain\ltrpar \rtlch\fcs1 \af4\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\charrsid3083065 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}}\pard \ltrpar
-\ql \fi-360\li720\ri0\nowidctlpar\wrapdefault\faauto\ls2\rin0\lin720\itap0\pararsid5338747 {\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid3083065 \hich\af4\dbch\af31505\loch\f4 
-the individual who purchased a LICENSE(s)\hich\af4\dbch\af31505\loch\f4  for the SOFTWARE; }{\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\lang1033\langfe1031\langnp1033\insrsid5338747 
-\par {\listtext\pard\plain\ltrpar \rtlch\fcs1 \af4\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\charrsid5338747 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}}{\rtlch\fcs1 \af4 \ltrch\fcs0 
-\f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid5338747 \hich\af4\dbch\af31505\loch\f4 the individual who was granted a LICENSE(s) for the SOFTWARE by the LICENSOR;}{\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\lang1033\langfe1031\langnp1033\insrsid5338747 
+\par }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \hich\af31506\dbch\af31505\loch\f31506 1. DEFINITIONS
+\par }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 
+\par \hich\af31506\dbch\af31505\loch\f31506 "SOFTWARE" means:
+\par {\listtext\pard\plain\ltrpar \s15 \rtlch\fcs1 \af31507\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}}\pard \ltrpar
+\s15\ql \fi-360\li720\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls21\adjustright\rin0\lin720\itap0\pararsid2585574 {\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 
+\hich\af31506\dbch\af31505\loch\f31506 a version of the cross-platform source code explorer kn\hich\af31506\dbch\af31505\loch\f31506 
+own as Sourcetrail in executable form. The version is defined by the two leading numbers of the version string (e.g. the version of Sourcetrail 2017.1.x is version 2017.1); and}{\rtlch\fcs1 \af31507 \ltrch\fcs0 
+\lang1033\langfe1031\langnp1033\insrsid2585574 
+\par {\listtext\pard\plain\ltrpar \s15 \rtlch\fcs1 \af31507\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}}{\rtlch\fcs1 \af31507 \ltrch\fcs0 
+\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \hich\af31506\dbch\af31505\loch\f31506 documentation for that version of Sourcetrail; and}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1033\langfe1031\langnp1033\insrsid2585574 
+\par {\listtext\pard\plain\ltrpar \s15 \rtlch\fcs1 \af31507\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}}{\rtlch\fcs1 \af31507 \ltrch\fcs0 
+\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \hich\af31506\dbch\af31505\loch\f31506 minor updates included i\hich\af31506\dbch\af31505\loch\f31506 
+n software maintenance which are indicated by an increase in the digits that follow the first two leading numbers of the version string (e.g. the update from Sourcetrail 2017.1.0 to Sourcetrail 2017.1.1 is a minor update).
+\par }\pard \ltrpar\s15\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid2585574 {\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 
+\hich\af31506\dbch\af31505\loch\f31506 "LICENSE" means:
+\par {\listtext\pard\plain\ltrpar \s15 \rtlch\fcs1 \af31507\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}}\pard \ltrpar
+\s15\ql \fi-360\li720\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls22\adjustright\rin0\lin720\itap0\pararsid2585574 {\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 
+\hich\af31506\dbch\af31505\loch\f31506 
+the permission to use and distribute the SOFTWARE as defined by the following sections of this document. The permissions granted especially depend on whether a SOFTWARE Non-Commercial License or a SOFTWARE Commercial License is agreed-upon.
+\par }\pard \ltrpar\s15\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid2585574 {\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 
+\hich\af31506\dbch\af31505\loch\f31506 "LICENSOR" me\hich\af31506\dbch\af31505\loch\f31506 ans:
+\par {\listtext\pard\plain\ltrpar \s15 \rtlch\fcs1 \af31507\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}}\pard \ltrpar
+\s15\ql \fi-360\li720\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls22\adjustright\rin0\lin720\itap0\pararsid2585574 {\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 
+\hich\af31506\dbch\af31505\loch\f31506 \hich\f31506 Coati Software KG, having a place of business at Jakob-Haringer-Stra\'df\loch\f31506 e 1/127, 5020 Salzburg, Austria.
+\par }\pard \ltrpar\s15\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid2585574 {\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 
+\hich\af31506\dbch\af31505\loch\f31506 "LICENSEE" means:}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1033\langfe1031\langnp1033\insrsid2585574 
+\par {\listtext\pard\plain\ltrpar \s15 \rtlch\fcs1 \af31507\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}}\pard \ltrpar
+\s15\ql \fi-360\li720\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls22\adjustright\rin0\lin720\itap0\pararsid2585574 {\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 
+\hich\af31506\dbch\af31505\loch\f31506 the individual who purchased a LICENSE(s) for the SOFTWARE;}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1033\langfe1031\langnp1033\insrsid2585574 
+\par {\listtext\pard\plain\ltrpar \s15 \rtlch\fcs1 \af31507\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}}{\rtlch\fcs1 \af31507 \ltrch\fcs0 
+\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \hich\af31506\dbch\af31505\loch\f31506 the individual who was granted a LICENSE(s) for the SOFTWARE by L\hich\af31506\dbch\af31505\loch\f31506 ICENSOR;}{\rtlch\fcs1 \af31507 \ltrch\fcs0 
+\lang1033\langfe1031\langnp1033\insrsid2585574 
+\par {\listtext\pard\plain\ltrpar \s15 \rtlch\fcs1 \af31507\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}}{\rtlch\fcs1 \af31507 \ltrch\fcs0 
+\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \hich\af31506\dbch\af31505\loch\f31506 the company, corporation, organization, or legal entity that purchased a LICENSE(s) for the SOFTWARE;}{\rtlch\fcs1 \af31507 \ltrch\fcs0 
+\lang1033\langfe1031\langnp1033\insrsid2585574 
+\par {\listtext\pard\plain\ltrpar \s15 \rtlch\fcs1 \af31507\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}}{\rtlch\fcs1 \af31507 \ltrch\fcs0 
+\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \hich\af31506\dbch\af31505\loch\f31506 the company, corporation, organization, or legal entity that was granted a LICENSE(s) for the SOFTWARE by LICENSOR.
+\par }\pard \ltrpar\s15\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid2585574 {\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 
+\hich\af31506\dbch\af31505\loch\f31506 "PARTIES" means:
+\par {\listtext\pard\plain\ltrpar \s15 \rtlch\fcs1 \af31507\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}}\pard \ltrpar
+\s15\ql \fi-360\li720\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls23\adjustright\rin0\lin720\itap0\pararsid2585574 {\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 
+\hich\af31506\dbch\af31505\loch\f31506 both L\hich\af31506\dbch\af31505\loch\f31506 ICENSOR and LICENSEE collectively.
+\par }\pard \ltrpar\s15\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid2585574 {\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 
+\hich\af31506\dbch\af31505\loch\f31506 "AUTHORIZED USER" means:
+\par {\listtext\pard\plain\ltrpar \s15 \rtlch\fcs1 \af31507\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}}\pard \ltrpar
+\s15\ql \fi-360\li720\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls23\adjustright\rin0\lin720\itap0\pararsid2585574 {\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 
+\hich\af31506\dbch\af31505\loch\f31506 the individual who is LICENSEE of the SOFTWARE. This individual is the only AUTHORIZED USER;}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1033\langfe1031\langnp1033\insrsid2585574 
+\par {\listtext\pard\plain\ltrpar \s15 \rtlch\fcs1 \af31507\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}}{\rtlch\fcs1 \af31507 \ltrch\fcs0 
+\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \hich\af31506\dbch\af31505\loch\f31506 an employee who is nameable on demand and might at any time use the SOFTWARE, of LICENSEE. Every AU\hich\af31506\dbch\af31505\loch\f31506 
+THORIZED USER known by name can be replaced by another user known by name only once in a month. From that time on, said first user must not use the SOFTWARE anymore and said second user may start to use the SOFTWARE. At no time may the number of the users
+\hich\af31506\dbch\af31505\loch\f31506  \hich\af31506\dbch\af31505\loch\f31506 known by name exceed the agreed-upon number of AUTHORIZED USER(s).\tab 
+\par }\pard \ltrpar\s15\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid2585574 {\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 
+\hich\af31506\dbch\af31505\loch\f31506 "ACTIVATION KEY" means: 
+\par {\listtext\pard\plain\ltrpar \s15 \rtlch\fcs1 \af31507\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}}\pard \ltrpar
+\s15\ql \fi-360\li720\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls24\adjustright\rin0\lin720\itap0\pararsid2585574 {\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 
+\hich\af31506\dbch\af31505\loch\f31506 a document issued by LICENSOR that defines all parameters of the SOFTWARE Commercial License. Said document specifies the name of the licensed SOFTWARE, the name\hich\af31506\dbch\af31505\loch\f31506 
+ of LICENSEE, the license type, the agreed-upon number of AUTHORIZED USERS, an upper limit for the licensed SOFTWARE version or an expiration date, and a hash-code. The combination of these values allows LICENSEE to unlock the full functionality of a genu
+\hich\af31506\dbch\af31505\loch\f31506 i\hich\af31506\dbch\af31505\loch\f31506 ne copy of the SOFTWARE for intended commercial use.
+\par }\pard \ltrpar\s15\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid2585574 {\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 
+\par 
+\par }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \hich\af31506\dbch\af31505\loch\f31506 2. GRANT
+\par }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 
+\par \hich\af31506\dbch\af31505\loch\f31506 The SOFTWARE is handed over to LICENSEE for its intended use. The scope of the intended use permitted by this AGREEMENT depends on whether a SOFTWARE Non-Commercial License or a SOFTWARE Comm
+\hich\af31506\dbch\af31505\loch\f31506 
+ercial License is agreed-upon. If a SOFTWARE Non-Commercial License is agreed-upon LICENSEE is allowed to use the SOFTWARE solely for non-commercial purposes. A purpose is non-commercial only if it is in no manner primarily intended for or directed toward
+\hich\af31506\dbch\af31505\loch\f31506  \hich\af31506\dbch\af31505\loch\f31506 commercial advantage or private monetary compensation.
+\par \hich\af31506\dbch\af31505\loch\f31506 Examples of non-commercial purposes:
+\par {\listtext\pard\plain\ltrpar \s15 \rtlch\fcs1 \af31507\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}}\pard \ltrpar
+\s15\ql \fi-360\li720\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls24\adjustright\rin0\lin720\itap0\pararsid2585574 {\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 
+\hich\af31506\dbch\af31505\loch\f31506 you are using the SOFTWARE to work on open-source projects for free;}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1033\langfe1031\langnp1033\insrsid2585574 
+\par {\listtext\pard\plain\ltrpar \s15 \rtlch\fcs1 \af31507\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}}{\rtlch\fcs1 \af31507 \ltrch\fcs0 
+\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \hich\af31506\dbch\af31505\loch\f31506 you are a student and you are using the SOFTWARE for your academic projects;}{\rtlch\fcs1 \af31507 \ltrch\fcs0 
+\lang1033\langfe1031\langnp1033\insrsid2585574 
+\par {\listtext\pard\plain\ltrpar \s15 \rtlch\fcs1 \af31507\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}}{\rtlch\fcs1 \af31507 \ltrch\fcs0 
+\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \hich\af31506\dbch\af31505\loch\f31506 you are usin\hich\af31506\dbch\af31505\loch\f31506 
+g the SOFTWARE in your spare time to work on the desktop application of your local football club for free.
+\par }\pard \ltrpar\s15\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid2585574 {\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 
+\hich\af31506\dbch\af31505\loch\f31506 Examples of commercial purposes, i.e. when you will need a Commercial License:
+\par {\listtext\pard\plain\ltrpar \s15 \rtlch\fcs1 \af31507\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}}\pard \ltrpar
+\s15\ql \fi-360\li720\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls25\adjustright\rin0\lin720\itap0\pararsid2585574 {\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 
+\hich\af31506\dbch\af31505\loch\f31506 you are using the SOFTWARE to work on open-source as well as on your\hich\af31506\dbch\af31505\loch\f31506  company's projects;}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1033\langfe1031\langnp1033\insrsid2585574 
+\par {\listtext\pard\plain\ltrpar \s15 \rtlch\fcs1 \af31507\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}}{\rtlch\fcs1 \af31507 \ltrch\fcs0 
+\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \hich\af31506\dbch\af31505\loch\f31506 you are a student and you are using the SOFTWARE for your work as a freelancer;}{\rtlch\fcs1 \af31507 \ltrch\fcs0 
+\lang1033\langfe1031\langnp1033\insrsid2585574 
+\par {\listtext\pard\plain\ltrpar \s15 \rtlch\fcs1 \af31507\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}}{\rtlch\fcs1 \af31507 \ltrch\fcs0 
+\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \hich\af31506\dbch\af31505\loch\f31506 you are using the SOFTWARE in your spare time to work on the desktop application of your local football club and you are getting paid for that.
+\par }\pard \ltrpar\s15\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid2585574 {\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 
+\par \hich\af31506\dbch\af31505\loch\f31506 Subject to the terms of this AGREEMENT, LICENSOR hereby grants LICENSEE}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1033\langfe1031\langnp1033\insrsid9004326 \hich\af31506\dbch\af31505\loch\f31506 
+ a worldwide, non-transferable}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \hich\af31506\dbch\af31505\loch\f31506 , non-exclusive, non-sub-licensable, limited LICENSE that allows:
+\par {\listtext\pard\plain\ltrpar \s15 \rtlch\fcs1 \af31507\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}}\pard \ltrpar
+\s15\ql \fi-360\li720\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls26\adjustright\rin0\lin720\itap0\pararsid2585574 {\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 
+\hich\af31506\dbch\af31505\loch\f31506 LICENSEE to distribute (an) ACTIVATION KEY(s) to A\hich\af31506\dbch\af31505\loch\f31506 UTHORIZED USER(s);}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1033\langfe1031\langnp1033\insrsid2585574 
+\par {\listtext\pard\plain\ltrpar \s15 \rtlch\fcs1 \af31507\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}}{\rtlch\fcs1 \af31507 \ltrch\fcs0 
+\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \hich\af31506\dbch\af31505\loch\f31506 
+LICENSEE and AUTHORIZED USER(s) to install the SOFTWARE on any number of computer PCs where potential use of the full functionality of the SOFTWARE is restricted exclusively to AUTHORIZED USER(s);}{\rtlch\fcs1 \af31507 \ltrch\fcs0 
+\lang1033\langfe1031\langnp1033\insrsid2585574 
+\par {\listtext\pard\plain\ltrpar \s15 \rtlch\fcs1 \af31507\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}}{\rtlch\fcs1 \af31507 \ltrch\fcs0 
+\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \hich\af31506\dbch\af31505\loch\f31506 LICENSEE and AUTHORIZED USER(s) to u\hich\af31506\dbch\af31505\loch\f31506 
+se the command-line interface of the SOFTWARE without unlocking the full functionality of the SOFTWARE;}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1033\langfe1031\langnp1033\insrsid2585574 
+\par {\listtext\pard\plain\ltrpar \s15 \rtlch\fcs1 \af31507\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}}{\rtlch\fcs1 \af31507 \ltrch\fcs0 
+\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \hich\af31506\dbch\af31505\loch\f31506 LICENSEE and AUTHORIZED USER(s) to use an ACTIVATION KEY to unlock the full functionality of the SOFTWARE for intended commercial use;}{\rtlch\fcs1 
+\af31507 \ltrch\fcs0 \lang1033\langfe1031\langnp1033\insrsid2585574 
+\par {\listtext\pard\plain\ltrpar \s15 \rtlch\fcs1 \af31507\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}}{\rtlch\fcs1 \af31507 \ltrch\fcs0 
+\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \hich\af31506\dbch\af31505\loch\f31506 LICENSEE and \hich\af31506\dbch\af31505\loch\f31506 
+AUTHORIZED USER(s) to truthfully declare their intend to solely use the SOFTWARE for non-commercial purposes to unlock the full functionality of the SOFTWARE for intended non-commercial use;}{\rtlch\fcs1 \af31507 \ltrch\fcs0 
+\lang1033\langfe1031\langnp1033\insrsid2585574 
+\par {\listtext\pard\plain\ltrpar \s15 \rtlch\fcs1 \af31507\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}}{\rtlch\fcs1 \af31507 \ltrch\fcs0 
+\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \hich\af31506\dbch\af31505\loch\f31506 AUTHORIZED USER(s) to apply any version of the unlocked SOFTWAR\hich\af31506\dbch\af31505\loch\f31506 
+E that specifies a version number less than or equal to the version number denoted in the ACTIVATION KEY to the permitted intended use. If the ACTIVATION KEY does not denote a version number, the AUTHORIZED USER is allowed to use any version of the SOFTWA
+\hich\af31506\dbch\af31505\loch\f31506 R\hich\af31506\dbch\af31505\loch\f31506 E for a period of time that is limited by the expiration date specified in the ACTIVATION KEY;}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1033\langfe1031\langnp1033\insrsid2585574 
 
-\par {\listtext\pard\plain\ltrpar \rtlch\fcs1 \af4\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\charrsid5338747 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}}{\rtlch\fcs1 \af4 \ltrch\fcs0 
-\f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid5338747 \hich\af4\dbch\af31505\loch\f4 the individual evaluating the SOFTWARE in trial mode; }{\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\lang1033\langfe1031\langnp1033\insrsid5338747 
-\par {\listtext\pard\plain\ltrpar \rtlch\fcs1 \af4\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\charrsid5338747 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}}{\rtlch\fcs1 \af4 \ltrch\fcs0 
-\f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid5338747 \hich\af4\dbch\af31505\loch\f4 the company, corporation, or organization that purchased a LICENSE(s) for the SOFTWARE;}{\rtlch\fcs1 \af4 \ltrch\fcs0 
-\f4\lang1033\langfe1031\langnp1033\insrsid5338747 
-\par {\listtext\pard\plain\ltrpar \rtlch\fcs1 \af4\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\charrsid5338747 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}}{\rtlch\fcs1 \af4 \ltrch\fcs0 
-\f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid5338747 \hich\af4\dbch\af31505\loch\f4 the com\hich\af4\dbch\af31505\loch\f4 pany, corporation, or organization that was granted a LICENSE(s) for the SOFTWARE by the LICENSOR.
-\par }\pard \ltrpar\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 {\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid3083065 \hich\af4\dbch\af31505\loch\f4 "PARTIES" means:
-\par {\listtext\pard\plain\ltrpar \rtlch\fcs1 \af4\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\charrsid3083065 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}}\pard \ltrpar
-\ql \fi-360\li720\ri0\nowidctlpar\wrapdefault\faauto\ls3\rin0\lin720\itap0\pararsid5338747 {\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid3083065 \hich\af4\dbch\af31505\loch\f4 
-both LICENSOR and LICENSEE collectively.
-\par }\pard \ltrpar\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 {\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid3083065 \hich\af4\dbch\af31505\loch\f4 "ACTIVATION KEY" means: 
-\par {\listtext\pard\plain\ltrpar \rtlch\fcs1 \af4\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\charrsid3083065 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}}\pard \ltrpar
-\ql \fi-360\li720\ri0\nowidctlpar\wrapdefault\faauto\ls3\rin0\lin720\itap0\pararsid5338747 {\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid3083065 \hich\af4\dbch\af31505\loch\f4 
-a document that defines the parameters of the LICENSE. It specifies th\hich\af4\dbch\af31505\loch\f4 
-e name of the licensed SOFTWARE, the name of the LICENSEE, the license type, an upper limit for the licensed SOFTWARE version or an expiration date, and a hash-code; the combination of these values allows the LICENSEE to unlock the full functionality of a
-\hich\af4\dbch\af31505\loch\f4  \hich\af4\dbch\af31505\loch\f4 genuine copy of the SOFTWARE.
-\par }\pard \ltrpar\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 {\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid3083065 \hich\af4\dbch\af31505\loch\f4 "AUTHORIZED USER" means:
-\par {\listtext\pard\plain\ltrpar \rtlch\fcs1 \af4\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\charrsid3083065 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}}\pard \ltrpar
-\ql \fi-360\li720\ri0\nowidctlpar\wrapdefault\faauto\ls3\rin0\lin720\itap0\pararsid5338747 {\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid3083065 \hich\af4\dbch\af31505\loch\f4 
-the individual who purchased a LICENSE(s) for the SOFTWARE; the individual is the only AUTHORIZED USER;
-\par {\listtext\pard\plain\ltrpar \rtlch\fcs1 \af4\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\charrsid3083065 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}\hich\af4\dbch\af31505\loch\f4 
-the individual who was granted a LICENSE(s) for the SOFTWARE by the LICENSOR; the individual is the only AUTHORIZED USER;
-\par {\listtext\pard\plain\ltrpar \rtlch\fcs1 \af4\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\charrsid3083065 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}\hich\af4\dbch\af31505\loch\f4 the individual evaluating the SOFTWARE in trial mode; 
-\par {\listtext\pard\plain\ltrpar \rtlch\fcs1 \af4\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\charrsid3083065 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}\hich\af4\dbch\af31505\loch\f4 
-an employee or independent contractor who might at any time use the SOFTWA\hich\af4\dbch\af31505\loch\f4 
-RE, of the LICENSEE; for each ACTIVATION KEY an entity has as many AUTHORIZED USER(s) as defined by the amount of seats specified in the ACTIVATION KEY; if no amount of seats is specified in the ACTIVATION KEY the entity has one AUTHORIZED USER for this A
-\hich\af4\dbch\af31505\loch\f4 C\hich\af4\dbch\af31505\loch\f4 TIVATION KEY.
-\par }\pard \ltrpar\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 {\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid3083065 
+\par {\listtext\pard\plain\ltrpar \s15 \rtlch\fcs1 \af31507\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}}{\rtlch\fcs1 \af31507 \ltrch\fcs0 
+\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \hich\af31506\dbch\af31505\loch\f31506 LICENSEE to make a copy of the SOFTWARE for archival purposes provided the copy contains all of the proprietary notices of the SOFTWARE.
+\par }\pard \ltrpar\s15\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid2585574 {\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 
 \par 
-\par }{\rtlch\fcs1 \af4 \ltrch\fcs0 \b\f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid5338747 \hich\af4\dbch\af31505\loch\f4 GRANT
-\par }{\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid3083065 
-\par \hich\af4\dbch\af31505\loch\f4 Subject to the terms of this AGREEMENT, the LICENSOR hereby grants the LICENSEE a worldwide, non-transferable, non-exclusive, non-sub-licensable, limited LICENSE that allows:
-\par {\listtext\pard\plain\ltrpar \rtlch\fcs1 \af4\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\charrsid3083065 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}}\pard \ltrpar
-\ql \fi-360\li720\ri0\nowidctlpar\wrapdefault\faauto\ls4\rin0\lin720\itap0\pararsid5338747 {\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid3083065 \hich\af4\dbch\af31505\loch\f4 
-the LICENSEE to distribute (an) ACTIVATION KEY(s) to AUT\hich\af4\dbch\af31505\loch\f4 HORIZED USER(s);}{\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\lang1033\langfe1031\langnp1033\insrsid5338747 
-\par {\listtext\pard\plain\ltrpar \rtlch\fcs1 \af4\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\charrsid5338747 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}}{\rtlch\fcs1 \af4 \ltrch\fcs0 
-\f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid5338747 \hich\af4\dbch\af31505\loch\f4 
-the LICENSEE and AUTHORIZED USER(s) to install the SOFTWARE on computer PCs where potential use of the SOFTWARE is restricted exclusively to AUTHORIZED USER(s);}{\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\lang1033\langfe1031\langnp1033\insrsid5338747 
-\par {\listtext\pard\plain\ltrpar \rtlch\fcs1 \af4\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\charrsid5338747 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}}{\rtlch\fcs1 \af4 \ltrch\fcs0 
-\f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid5338747 \hich\af4\dbch\af31505\loch\f4 the LICENSEE and AUTHORIZED USER(s) to use an ACTIVATION KEY to unlock the\hich\af4\dbch\af31505\loch\f4  SOFTWARE;}{\rtlch\fcs1 \af4 \ltrch\fcs0 
-\f4\lang1033\langfe1031\langnp1033\insrsid5338747 
-\par {\listtext\pard\plain\ltrpar \rtlch\fcs1 \af4\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\charrsid5338747 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}}{\rtlch\fcs1 \af4 \ltrch\fcs0 
-\f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid5338747 \hich\af4\dbch\af31505\loch\f4 AUTHORIZED USER(s) to use any version of the SOFTWARE in trial mode;}{\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\lang1033\langfe1031\langnp1033\insrsid5338747 
-\par {\listtext\pard\plain\ltrpar \rtlch\fcs1 \af4\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\charrsid5338747 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}}{\rtlch\fcs1 \af4 \ltrch\fcs0 
-\f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid5338747 \hich\af4\dbch\af31505\loch\f4 
-AUTHORIZED USER(s) to use any version of the unlocked SOFTWARE that specifies a version number less than or equal to the version number denoted in the ACTIVATION KEY; if th\hich\af4\dbch\af31505\loch\f4 
-e ACTIVATION KEY does not denote a version number the AUTHORIZED USER is allowed to use any version of the SOFTWARE for a period of time that is limited by the expiration date specified in the ACTIVATION KEY;}{\rtlch\fcs1 \af4 \ltrch\fcs0 
-\f4\lang1033\langfe1031\langnp1033\insrsid5338747 
-\par {\listtext\pard\plain\ltrpar \rtlch\fcs1 \af4\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\charrsid5338747 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}}{\rtlch\fcs1 \af4 \ltrch\fcs0 
-\f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid5338747 \hich\af4\dbch\af31505\loch\f4 LICENSEE to make a copy of the SOFTWARE for a\hich\af4\dbch\af31505\loch\f4 
-rchival purposes provided the copy contains all of the proprietary notices of the SOFTWARE.
-\par }\pard \ltrpar\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 {\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid3083065 
+\par }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \hich\af31506\dbch\af31505\loch\f31506 3. RESTRICTIONS
+\par }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 
+\par \hich\af31506\dbch\af31505\loch\f31506 LIC\hich\af31506\dbch\af31505\loch\f31506 ENSEE and AUTHORIZED USER(s) will not, and will have no right to:
+\par {\listtext\pard\plain\ltrpar \s15 \rtlch\fcs1 \af31507\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}}\pard \ltrpar
+\s15\ql \fi-360\li720\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\ls27\adjustright\rin0\lin720\itap0\pararsid2585574 {\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 
+\hich\af31506\dbch\af31505\loch\f31506 modify, translate, reverse engineer, decompile, disassemble (except to the extent applicable laws specifically prohibit such restriction), create derivative works based on, or otherwise at
+\hich\af31506\dbch\af31505\loch\f31506 tempt to discover the source code or underlying ideas or algorithms of the SOFTWARE;}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1033\langfe1031\langnp1033\insrsid2585574 
+\par {\listtext\pard\plain\ltrpar \s15 \rtlch\fcs1 \af31507\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}}{\rtlch\fcs1 \af31507 \ltrch\fcs0 
+\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \hich\af31506\dbch\af31505\loch\f31506 sell, rent, lease, distribute, or otherwise transfer rights to the SOFTWARE without prior written consent from LICENSOR;}{\rtlch\fcs1 \af31507 
+\ltrch\fcs0 \lang1033\langfe1031\langnp1033\insrsid2585574 
+\par {\listtext\pard\plain\ltrpar \s15 \rtlch\fcs1 \af31507\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}}{\rtlch\fcs1 \af31507 \ltrch\fcs0 
+\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \hich\af31506\dbch\af31505\loch\f31506 remove any proprietary notices or labels from \hich\af31506\dbch\af31505\loch\f31506 the SOFTWARE;}{\rtlch\fcs1 \af31507 \ltrch\fcs0 
+\lang1033\langfe1031\langnp1033\insrsid2585574 
+\par {\listtext\pard\plain\ltrpar \s15 \rtlch\fcs1 \af31507\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}}{\rtlch\fcs1 \af31507 \ltrch\fcs0 
+\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \hich\af31506\dbch\af31505\loch\f31506 distribute, use, or transfer an ACTIVATION KEY(s) that has been superseded by an ACTIVATION KEY(s) provided with software maintenance.
+\par }\pard \ltrpar\s15\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid2585574 {\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 
 \par 
-\par }{\rtlch\fcs1 \af4 \ltrch\fcs0 \b\f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid5338747 \hich\af4\dbch\af31505\loch\f4 RESTRICTIONS AND CONFIDENTIALITY
-\par }{\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid3083065 
-\par \hich\af4\dbch\af31505\loch\f4 The LICENSEE will not, and will have no right to:}{\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\lang1033\langfe1031\langnp1033\insrsid5338747 
-\par {\listtext\pard\plain\ltrpar \rtlch\fcs1 \af4\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\charrsid3083065 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}}\pard \ltrpar
-\ql \fi-360\li720\ri0\nowidctlpar\wrapdefault\faauto\ls5\rin0\lin720\itap0\pararsid5338747 {\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid3083065 \hich\af4\dbch\af31505\loch\f4 
-modify, translate, reverse engineer, decompile, disassemble (except to the e\hich\af4\dbch\af31505\loch\f4 
-xtent applicable laws specifically prohibit such restriction), create derivative works based on, or otherwise attempt to discover the source code or underlying ideas or algorithms of the SOFTWARE;}{\rtlch\fcs1 \af4 \ltrch\fcs0 
-\f4\lang1033\langfe1031\langnp1033\insrsid5338747 
-\par {\listtext\pard\plain\ltrpar \rtlch\fcs1 \af4\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\charrsid5338747 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}}{\rtlch\fcs1 \af4 \ltrch\fcs0 
-\f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid5338747 \hich\af4\dbch\af31505\loch\f4 sell, rent, lease, distribute, or otherwise transfer righ\hich\af4\dbch\af31505\loch\f4 ts to the SOFTWARE without prior written consent from LICENSOR;}{
-\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\lang1033\langfe1031\langnp1033\insrsid5338747 
-\par {\listtext\pard\plain\ltrpar \rtlch\fcs1 \af4\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\charrsid5338747 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}}{\rtlch\fcs1 \af4 \ltrch\fcs0 
-\f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid5338747 \hich\af4\dbch\af31505\loch\f4 remove any proprietary notices or labels from the SOFTWARE;}{\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\lang1033\langfe1031\langnp1033\insrsid5338747 
-\par {\listtext\pard\plain\ltrpar \rtlch\fcs1 \af4\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\charrsid5338747 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}}{\rtlch\fcs1 \af4 \ltrch\fcs0 
-\f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid5338747 \hich\af4\dbch\af31505\loch\f4 distribute, use, or transfer an ACTIVATION KEY(s) that has been superseded by an ACTIVATION KEY(s) provided with software mainte
-\hich\af4\dbch\af31505\loch\f4 nance.
-\par }\pard \ltrpar\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 {\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid3083065 \hich\af4\dbch\af31505\loch\f4 
-AUTHORIZED USER(s) will not, and will have no right to:
-\par {\listtext\pard\plain\ltrpar \rtlch\fcs1 \af4\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\charrsid3083065 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}}\pard \ltrpar
-\ql \fi-360\li720\ri0\nowidctlpar\wrapdefault\faauto\ls6\rin0\lin720\itap0\pararsid5338747 {\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid3083065 \hich\af4\dbch\af31505\loch\f4 
-use an unlocked version of the SOFTWARE that exceeds the version string specified in the ACTIVATION KEY; }{\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\lang1033\langfe1031\langnp1033\insrsid5338747 
-\par {\listtext\pard\plain\ltrpar \rtlch\fcs1 \af4\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\charrsid5338747 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}}{\rtlch\fcs1 \af4 \ltrch\fcs0 
-\f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid5338747 \hich\af4\dbch\af31505\loch\f4 use the trial mode of the SOFTWARE for any commercial purposes; }{\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\lang1033\langfe1031\langnp1033\insrsid5338747 
-\par {\listtext\pard\plain\ltrpar \rtlch\fcs1 \af4\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1031\langnp1033\charrsid5338747 \loch\af3\dbch\af31505\hich\f3 \'b7\tab}}{\rtlch\fcs1 \af4 \ltrch\fcs0 
-\f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid5338747 \hich\af4\dbch\af31505\loch\f4 use a Private/Ac\hich\af4\dbch\af31505\loch\f4 ademic License of the software for any commercial purposes.
-\par }\pard \ltrpar\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 {\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid3083065 \hich\af4\dbch\af31505\loch\f4 
-Unless a valid non-disclosure agreement exists between the Parties, in which case the terms of that non-disclosure agreement shall apply, the following terms shall: Except as necessary for its per\hich\af4\dbch\af31505\loch\f4 
-formance under the AGREEMENT or required by law, the LICENSOR shall not disclose to anyone any information furnished by the LICENSEE that is marked as confidential or proprietary.
-\par 
-\par }{\rtlch\fcs1 \af4 \ltrch\fcs0 \b\f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid5338747 \hich\af4\dbch\af31505\loch\f4 TITLE AND COPYRIGHT
-\par }{\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid3083065 
-\par \hich\af4\dbch\af31505\loch\f4 
-Title, ownership rights, intellectual property rights, and copyright to the SOFTWARE, and any copies or portions thereof, shall remain in LICENSOR. The SOFTWARE is protected by European copyright directives, Austrian copyright laws as well as United State
-\hich\af4\dbch\af31505\loch\f4 s\hich\af4\dbch\af31505\loch\f4  copyright laws and international treaty provisions.
+\par }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \hich\af31506\dbch\af31505\loch\f31506 4. CONFIDENTIALITY
+\par }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 
+\par \hich\af31506\dbch\af31505\loch\f31506 The SOFTWARE contains a feature that will automatically connect to LICENSOR's serve\hich\af31506\dbch\af31505\loch\f31506 
+rs to check for a new program version. The data sent in this process contains NO POTENTIALLY SENSITIVE INFORMATION. The user can opt-out from this feature.
+\par \hich\af31506\dbch\af31505\loch\f31506 Unless a valid non-disclosure agreement exists between the Parties, in which case the terms of that \hich\af31506\dbch\af31505\loch\f31506 
+non-disclosure agreement shall apply, the following terms shall: Except as necessary for its performance under the AGREEMENT or required by law, LICENSOR shall not disclose to anyone any information furnished by LICENSEE that is marked as confidential or 
+\hich\af31506\dbch\af31505\loch\f31506 p\hich\af31506\dbch\af31505\loch\f31506 roprietary.
 \par 
 \par 
-\par }{\rtlch\fcs1 \af4 \ltrch\fcs0 \b\f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid5338747 \hich\af4\dbch\af31505\loch\f4 DISCLAIMER OF WARRANTY
-\par }{\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid3083065 
-\par \hich\af4\dbch\af31505\loch\f4 THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND. LICENSOR HEREBY DISCLAIMS ALL EXPRESS OR IMPLIED WARRANTIES, INCLUDING WITHOUT LIMITATION WARRANTIES OF MERCHANTABI\hich\af4\dbch\af31505\loch\f4 
-LITY, FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS AGREEMENT. SOME U.S. STATES DO NOT ALLOW EXCLUSIONS OF AN IMPLIED WARRANTY, SO THIS DISCLAIMER MAY NOT APPLY TO LICENSEE. LICEN
-\hich\af4\dbch\af31505\loch\f4 S\hich\af4\dbch\af31505\loch\f4 EE MAY HAVE OTHER LEGAL RIGHTS THAT VARY FROM STATE TO STATE OR BY JURISDICTION.
+\par }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \hich\af31506\dbch\af31505\loch\f31506 5. TITLE AND COPYRIGHT
+\par }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 
+\par \hich\af31506\dbch\af31505\loch\f31506 
+Title, ownership rights, intellectual property rights, and copyright to the SOFTWARE, and any copies or portions thereof, shall remain in LICENSOR. The SOFTWARE is protected by European copyright directives, Austrian c
+\hich\af31506\dbch\af31505\loch\f31506 opyright laws as well as United States copyright laws and international treaty provisions.
 \par 
 \par 
-\par }{\rtlch\fcs1 \af4 \ltrch\fcs0 \b\f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid5338747 \hich\af4\dbch\af31505\loch\f4 LIMITATION OF LIABILITY
-\par }{\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid3083065 
-\par \hich\af4\dbch\af31505\loch\f4 LICENSEE ASSUMES THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE SOFTWARE. LICENSOR ASSUMES NO LIABILITY FOR THE COST OF ANY SERVICE OR REP\hich\af4\dbch\af31505\loch\f4 
-AIR IF THE SOFTWARE IS DEFECTIVE. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, TORT, CONTRACT, STRICT LIABILITY, OR OTHERWISE, SHALL LICENSOR, OR ITS LICENSORS, SUPPLIERS OR RESELLERS, BE LIABLE TO LICENSEE OR ANY OTHER PERSON FOR ANY INDIRECT, SPECI
-\hich\af4\dbch\af31505\loch\f4 A\hich\af4\dbch\af31505\loch\f4 
-L, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES. IN NO EVENT WILL LICENSO
-\hich\af4\dbch\af31505\loch\f4 R\hich\af4\dbch\af31505\loch\f4 
- BE LIABLE FOR ANY DAMAGES IN EXCESS OF THE MONEY PAID FOR THE SOFTWARE, EVEN IF LICENSOR SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES, OR FOR ANY CLAIM BY ANY OTHER PARTY. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH
-\hich\af4\dbch\af31505\loch\f4  \hich\af4\dbch\af31505\loch\f4 
-OR PERSONAL INJURY TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. FURTHERMORE, SOME U.S. STATES DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS LIMITATION AND EXCLUSION MAY NOT APPLY TO LICENSEE.
+\par }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \hich\af31506\dbch\af31505\loch\f31506 6. DISCLAIMER OF WARRANTY
+\par }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 
+\par \hich\af31506\dbch\af31505\loch\f31506 
+THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND. LICENSOR HEREBY DISCLAIMS ALL EXPRESS OR IMPLIED WARRANTIES, INCLUDING WITHOUT LIMITATION WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS DISCLAIMER 
+\hich\af31506\dbch\af31505\loch\f31506 O\hich\af31506\dbch\af31505\loch\f31506 
+F WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS AGREEMENT. SOME U.S. STATES DO NOT ALLOW EXCLUSIONS OF AN IMPLIED WARRANTY, SO THIS DISCLAIMER MAY NOT APPLY TO LICENSEE. LICENSEE MAY HAVE OTHER LEGAL RIGHTS THAT VARY FROM STATE TO STATE OR BY JURISDICTIO
+\hich\af31506\dbch\af31505\loch\f31506 N.
 \par 
 \par 
-\par }{\rtlch\fcs1 \af4 \ltrch\fcs0 \b\f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid5338747 \hich\af4\dbch\af31505\loch\f4 TERMINAT\hich\af4\dbch\af31505\loch\f4 ION
-\par }{\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid3083065 
-\par \hich\af4\dbch\af31505\loch\f4 
-The license granted herein shall be perpetual. If LICENSEE fails to comply with any of the terms of this AGREEMENT, this AGREEMENT and the rights granted herein will terminate immediately. LICENSOR may, at its sole discretion and at any time, terminat
-\hich\af4\dbch\af31505\loch\f4 e this AGREEMENT. On termination, LICENSEE must cease using and destroy all copies of the SOFTWARE.
+\par }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \hich\af31506\dbch\af31505\loch\f31506 7. LIMITATION OF LIABILITY
+\par }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 
+\par \hich\af31506\dbch\af31505\loch\f31506 
+LICENSEE ASSUMES THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE SOFTWARE. LICENSOR ASSUMES NO LIABILITY FOR THE COST OF ANY SERVICE OR REPAIR IF THE SOFTWARE IS DEFECTIVE. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL 
+\hich\af31506\dbch\af31505\loch\f31506 
+THEORY, TORT, CONTRACT, STRICT LIABILITY, OR OTHERWISE, SHALL LICENSOR, OR ITS LICENSORS, SUPPLIERS OR RESELLERS, BE LIABLE TO LICENSEE OR ANY OTHER PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
+\hich\af31506\dbch\af31505\loch\f31506  \hich\af31506\dbch\af31505\loch\f31506 
+LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES. IN NO EVENT WILL LICENSOR BE LIABLE FOR ANY DAMAGES IN EXCESS OF THE MONEY PAID FOR THE SOFTWARE, EV
+\hich\af31506\dbch\af31505\loch\f31506 E\hich\af31506\dbch\af31505\loch\f31506 
+N IF LICENSOR SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES, OR FOR ANY CLAIM BY ANY OTHER PARTY. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. 
+\hich\af31506\dbch\af31505\loch\f31506 F\hich\af31506\dbch\af31505\loch\f31506 URTHERMORE, SOME U.S. STATES DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS LIMITATION AND EXCLUSION MAY NOT APPLY TO LICENSEE.
 \par 
 \par 
-\par }{\rtlch\fcs1 \af4 \ltrch\fcs0 \b\f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid5338747 \hich\af4\dbch\af31505\loch\f4 EXPORT CONTROLS
-\par }{\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid3083065 
-\par \hich\af4\dbch\af31505\loch\f4 LICENSEE shall comply with all export laws, restrictions and regulations of the United States, the Directive 2009/428/EC of the European \hich\af4\dbch\af31505\loch\f4 \hich\f4 
-Parliament and of the Council and the Austrian Au\'df\loch\f4 
-enwirtschaftsgesetz 2011, BGBl I No. 26/2011. LICENSEE shall not export, re-export or otherwise transfer the SOFTWARE to any country for which the United States or the European Union or Austria maintains a\hich\af4\dbch\af31505\loch\f4 n
-\hich\af4\dbch\af31505\loch\f4 
- embargo, or to any person or entity on the U.S. Department of Treasury List of Specially Designated Nationals or the U.S. Department of Commerce Denied Persons List or Entity List. LICENSEE represents and warrants that licensee is not located in, under t
-\hich\af4\dbch\af31505\loch\f4 h\hich\af4\dbch\af31505\loch\f4 e control of, or a national or resident of any restricted country or on any such list.
+\par }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \hich\af31506\dbch\af31505\loch\f31506 8. TERMINATION
+\par }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 
+\par \hich\af31506\dbch\af31505\loch\f31506 The LICENSE granted herein shall be perpetual. If LICENSEE fails to \hich\af31506\dbch\af31505\loch\f31506 
+comply with any of the terms of this AGREEMENT, this AGREEMENT and the rights granted herein will terminate immediately. As such the Non-Commercial LICENSE terminates automatically if the usage of SOFTWARE becomes commercial. LICENSOR may, at its sole dis
+\hich\af31506\dbch\af31505\loch\f31506 c\hich\af31506\dbch\af31505\loch\f31506 retion and at any time, terminate this AGREEMENT. On termination, LICENSEE must cease using and destroy all copies of the SOFTWARE.
 \par 
 \par 
-\par }{\rtlch\fcs1 \af4 \ltrch\fcs0 \b\f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid5338747 \hich\af4\dbch\af31505\loch\f4 THIRD PARTY CREDITS
-\par }{\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid3083065 
-\par \hich\af4\dbch\af31505\loch\f4 \hich\f4 
-Portions of the SOFTWARE utilize or include third party software and other copyrighted materials. Credits, licensing terms, and disclaimers for such materials are contained in the installation directory for the SOFTWARE, and are accessible via the \'93
-\loch\f4 3rd Pa\hich\af4\dbch\af31505\loch\f4 r\hich\af4\dbch\af31505\loch\f4 \hich\f4 ty Licenses\'94\loch\f4  dialog for the SOFTWARE. LICENSEE agrees that use of such copyrighted materials is governed by their respective terms.
-\par 
-\par }{\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid5338747 
-\par }{\rtlch\fcs1 \af4 \ltrch\fcs0 \b\f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid5338747 \hich\af4\dbch\af31505\loch\f4 ENTIRE AGREEMENT
-\par }{\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid3083065 
-\par \hich\af4\dbch\af31505\loch\f4 This AGREEMENT represents the complete agreement concerning this SOFTWARE between the PARTIES and supers\hich\af4\dbch\af31505\loch\f4 
-edes all prior agreements and representations between them. It may be amended only in writing executed by both PARTIES. Coati Software OG reserves the exclusive right to periodically update this AGREEMENT at its discretion at any time, with reasonable not
-\hich\af4\dbch\af31505\loch\f4 i\hich\af4\dbch\af31505\loch\f4 
-ce to LICENSEE by posting the new AGREEMENT at the following URL: <https://www.sourcetrail.com/terms-of-use>. Any action arising out of or relating to this AGREEMENT may be brought exclusively in Salzburg, Austria, and the PARTIES irrevocably consent to t
-\hich\af4\dbch\af31505\loch\f4 h\hich\af4\dbch\af31505\loch\f4 e jurisdiction of such courts and venue in Salzburg, Austria.
+\par }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \hich\af31506\dbch\af31505\loch\f31506 9. EXPORT CONTROLS
+\par }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 
+\par \hich\af31506\dbch\af31505\loch\f31506 LICENSEE shall comply with all export laws, restrictions and regulations of the United States, the Dir\hich\af31506\dbch\af31505\loch\f31506 \hich\f31506 
+ective 2009/428/EC of the European Parliament and of the Council and the Austrian Au\'df\loch\f31506 
+enwirtschaftsgesetz 2011, BGBl I No. 26/2011. LICENSEE shall not export, re-export or otherwise transfer the SOFTWARE to any country for which the United States or the Eu\hich\af31506\dbch\af31505\loch\f31506 r\hich\af31506\dbch\af31505\loch\f31506 
+opean Union or Austria maintains an embargo, or to any person or entity on the U.S. Department of Treasury List of Specially Designated Nationals or the U.S. Department of Commerce Denied Persons List or Entity List. LICENSEE represents and warrants that 
+\hich\af31506\dbch\af31505\loch\f31506 L\hich\af31506\dbch\af31505\loch\f31506 ICENSEE is not located in, under the control of, or a national or resident of any restricted country or on any such list.
 \par 
 \par 
-\par }{\rtlch\fcs1 \af4 \ltrch\fcs0 \b\f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid5338747 \hich\af4\dbch\af31505\loch\f4 CONTACT
-\par }{\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\lang1033\langfe1031\langnp1033\insrsid5338747\charrsid3083065 
-\par \hich\af4\dbch\af31505\loch\f4 If you have questions regarding this agreement, contact:
-\par }{\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\insrsid5338747 \hich\af4\dbch\af31505\loch\f4 Coati Software OG
-\par \hich\af4\dbch\af31505\loch\f4 \hich\f4 Jakob-Haringer-Stra\'df\loch\f4 e 1/127
-\par \hich\af4\dbch\af31505\loch\f4 5020 Salzburg
-\par \hich\af4\dbch\af31505\loch\f4 Austria
+\par }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \hich\af31506\dbch\af31505\loch\f31506 10. YOUR RESPONSIBILITIES.  
+\par }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 
+\par \hich\af31506\dbch\af31505\loch\f31506 LICENSEE agrees to immediately notify LICENSOR in writing of any misuse, misappropriation or unauthori\hich\af31506\dbch\af31505\loch\f31506 
+zed use, disclosure, display or copying of the SOFTWARE that may come to LICENSEE's attention. In addition, LICENSEE agrees to defend, indemnify and hold LICENSOR, its suppliers and any of its directors, officers, employees or affiliates of any of the for
+\hich\af31506\dbch\af31505\loch\f31506 e\hich\af31506\dbch\af31505\loch\f31506 going harmless from any and all claims resulting from or arising out of LICENSEE's use of the Software or breach of this AGREEMENT.
 \par 
-\par \hich\af4\dbch\af31505\loch\f4 support@sourcetrail.com
-\par }\pard \ltrpar\ql \li0\ri0\sa160\sl259\slmult1\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 {\rtlch\fcs1 \af4 \ltrch\fcs0 \f4\insrsid5338747 
+\par 
+\par }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \hich\af31506\dbch\af31505\loch\f31506 11. THIRD PARTY CREDITS
+\par }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 
+\par \hich\af31506\dbch\af31505\loch\f31506 Portions of the SOFTWARE utilize or include third party software and other copyrighted materials.\hich\af31506\dbch\af31505\loch\f31506 \hich\f31506 
+ Credits, licensing terms, and disclaimers for such materials are contained in the installation directory for the SOFTWARE, and are accessible via the \'93\loch\f31506 \hich\f31506 3rd Party Licenses\'94\loch\f31506 
+ dialog for the SOFTWARE. LICENSEE agrees that use of such copyrighted materials is \hich\af31506\dbch\af31505\loch\f31506 g\hich\af31506\dbch\af31505\loch\f31506 overned by their respective terms.
+\par 
+\par 
+\par }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \hich\af31506\dbch\af31505\loch\f31506 12. SEVERABILITY
+\par }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 
+\par \hich\af31506\dbch\af31505\loch\f31506 If a particular term of this AGREEMENT is not enforceable, the unenforceability of that term will not affect any other terms of this AGREEMENT.
+\par 
+\par 
+\par }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \hich\af31506\dbch\af31505\loch\f31506 13. HEADINGS
+\par }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 
+\par \hich\af31506\dbch\af31505\loch\f31506 The section headings used herein are for convenience only and do not affect the interpretation of this AGREEMENT.
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506  
+\par }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \hich\af31506\dbch\af31505\loch\f31506 14. NO WAIVER
+\par }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 
+\par \hich\af31506\dbch\af31505\loch\f31506 LICENSOR's failure to enforce or exercise any part of this AGREEMENT is not a waiver of that part.
+\par 
+\par 
+\par }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \hich\af31506\dbch\af31505\loch\f31506 15. ENTIRE AGREEMENT
+\par }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 
+\par \hich\af31506\dbch\af31505\loch\f31506 T\hich\af31506\dbch\af31505\loch\f31506 
+his AGREEMENT represents the complete agreement concerning this SOFTWARE between the PARTIES and supersedes all prior agreements and representations between them. It may be amended only in writing executed by both PARTIES. The inclusion of LICENSEE's own 
+\hich\af31506\dbch\af31505\loch\f31506 t\hich\af31506\dbch\af31505\loch\f31506 
+erms and conditions is contradicted, unless their validity has explicitly been agreed to. LICENSOR reserves the exclusive right to update this AGREEMENT for new SOFTWARE versions. By using these new SOFTWARE versions the new AGREEMENT supersedes any older
+\hich\af31506\dbch\af31505\loch\f31506  \hich\af31506\dbch\af31505\loch\f31506 
+one. Any action arising out of or relating to this AGREEMENT may be brought exclusively in Salzburg, Austria, and the PARTIES irrevocably consent to the jurisdiction of such courts and venue in Salzburg, Austria.
+\par 
+\par 
+\par }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \b\lang1033\langfe1031\langnp1033\insrsid2585574\charrsid10582864 \hich\af31506\dbch\af31505\loch\f31506 CONTACT
+\par }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 
+\par \hich\af31506\dbch\af31505\loch\f31506 If you have questions regarding \hich\af31506\dbch\af31505\loch\f31506 this AGREEMENT, contact:
+\par }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid2585574\charrsid2585574 \hich\af31506\dbch\af31505\loch\f31506 Coati Software KG
+\par \hich\af31506\dbch\af31505\loch\f31506 \hich\f31506 Jakob-Haringer-Stra\'df\loch\f31506 e 1/127
+\par }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1033\langfe1031\langnp1033\insrsid2585574\charrsid2585574 \hich\af31506\dbch\af31505\loch\f31506 5020 Salzburg
+\par \hich\af31506\dbch\af31505\loch\f31506 Austria
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 support@sourcetrail.com}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid5338747\charrsid2585574 
 \par }{\*\themedata 504b030414000600080000002100828abc13fa0000001c020000130000005b436f6e74656e745f54797065735d2e786d6cac91cb6ac3301045f785fe83d0b6d8
 72ba28a5d8cea249777d2cd20f18e4b12d6a8f843409c9df77ecb850ba082d74231062ce997b55ae8fe3a00e1893f354e9555e6885647de3a8abf4fbee29bbd7
 2a3150038327acf409935ed7d757e5ee14302999a654e99e393c18936c8f23a4dc072479697d1c81e51a3b13c07e4087e6b628ee8cf5c4489cf1c4d075f92a0b
@@ -394,8 +646,8 @@ fffffffffffffffffdfffffffeffffffffffffffffffffffffffffffffffffffffffffffffffffff
 ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
 ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
 ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffffffffffffec69d9888b8b3d4c859eaf6cd158be0f000000000000000000000000d095
-c2fbbde9d201feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000
+ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffffffffffffec69d9888b8b3d4c859eaf6cd158be0f000000000000000000000000100f
+95b7aacdd301feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000
 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff000000000000000000000000000000000000000000000000
 0000000000000000000000000000000000000000000000000105000000000000}}

bin/app/data/gui/installer/EULA.txt

@@ -1,6 +1,6 @@
 Sourcetrail
 Software License Agreement (“AGREEMENT”)
-Last date of change: 2017-06-19
+Last date of change: 2018-04-06
 
 BY INSTALLING OR USING THIS SOFTWARE, YOU ARE BECOMING A PARTY TO, AND ARE CONSENTING TO BE BOUND BY, THIS AGREEMENT. IF YOU DO NOT AGREE TO ALL OF THE TERMS OF THIS AGREEMENT, DO NOT INSTALL OR USE THIS SOFTWARE.
 
@@ -8,93 +8,123 @@ BY INSTALLING OR USING THIS SOFTWARE, YOU ARE BECOMING A PARTY TO, AND ARE CONSE
 1. DEFINITIONS
 
 "SOFTWARE" means:
-•	A version of the cross-platform source code explorer known as Sourcetrail in executable form. The version is defined by the two leading numbers of the version string (e.g. the version of Sourcetrail 2017.1.x is version 2017.1);
-•	documentation for that version of Sourcetrail;
-•	minor updates included in software maintenance which are indicated by an increase in the digits that follow the first two leading numbers of the version string (e.g. the update from Sourcetrail 2017.1.0 to Sourcetrail 2017.1.1 is a minor update).
+*	a version of the cross-platform source code explorer known as Sourcetrail in executable form. The version is defined by the two leading numbers of the version string (e.g. the version of Sourcetrail 2017.1.x is version 2017.1); and
+*	documentation for that version of Sourcetrail; and
+*	minor updates included in software maintenance which are indicated by an increase in the digits that follow the first two leading numbers of the version string (e.g. the update from Sourcetrail 2017.1.0 to Sourcetrail 2017.1.1 is a minor update).
 "LICENSE" means:
-•	the permission to use, reproduction and distribution of the SOFTWARE as defined by the following sections of this document.
+*	the permission to use and distribute the SOFTWARE as defined by the following sections of this document. The permissions granted especially depend on whether a SOFTWARE Non-Commercial License or a SOFTWARE Commercial License is agreed-upon.
 "LICENSOR" means:
-•	Coati Software OG, having a place of business at Jakob-Haringer-Straße 1/127, 5020 Salzburg, Austria.
+*	Coati Software KG, having a place of business at Jakob-Haringer-Straße 1/127, 5020 Salzburg, Austria.
 "LICENSEE" means:
-•	the individual who purchased a LICENSE(s) for the SOFTWARE; 
-•	the individual who was granted a LICENSE(s) for the SOFTWARE by the LICENSOR;
-•	the individual evaluating the SOFTWARE in trial mode; 
-•	the company, corporation, or organization that purchased a LICENSE(s) for the SOFTWARE;
-•	the company, corporation, or organization that was granted a LICENSE(s) for the SOFTWARE by the LICENSOR.
+*	the individual who purchased a LICENSE(s) for the SOFTWARE;
+*	the individual who was granted a LICENSE(s) for the SOFTWARE by LICENSOR;
+*	the company, corporation, organization, or legal entity that purchased a LICENSE(s) for the SOFTWARE;
+*	the company, corporation, organization, or legal entity that was granted a LICENSE(s) for the SOFTWARE by LICENSOR.
 "PARTIES" means:
-•	both LICENSOR and LICENSEE collectively.
-"ACTIVATION KEY" means: 
-•	a document that defines the parameters of the LICENSE. It specifies the name of the licensed SOFTWARE, the name of the LICENSEE, the license type, an upper limit for the licensed SOFTWARE version or an expiration date, and a hash-code; the combination of these values allows the LICENSEE to unlock the full functionality of a genuine copy of the SOFTWARE.
+*	both LICENSOR and LICENSEE collectively.
 "AUTHORIZED USER" means:
-•	the individual who purchased a LICENSE(s) for the SOFTWARE; the individual is the only AUTHORIZED USER;
-•	the individual who was granted a LICENSE(s) for the SOFTWARE by the LICENSOR; the individual is the only AUTHORIZED USER;
-•	the individual evaluating the SOFTWARE in trial mode; 
-•	an employee or independent contractor who might at any time use the SOFTWARE, of the LICENSEE; for each ACTIVATION KEY an entity has as many AUTHORIZED USER(s) as defined by the amount of seats specified in the ACTIVATION KEY; if no amount of seats is specified in the ACTIVATION KEY the entity has one AUTHORIZED USER for this ACTIVATION KEY.
+*	the individual who is LICENSEE of the SOFTWARE. This individual is the only AUTHORIZED USER;
+*	an employee who is nameable on demand and might at any time use the SOFTWARE, of LICENSEE. Every AUTHORIZED USER known by name can be replaced by another user known by name only once in a month. From that time on, said first user must not use the SOFTWARE anymore and said second user may start to use the SOFTWARE. At no time may the number of the users known by name exceed the agreed-upon number of AUTHORIZED USER(s).	
+"ACTIVATION KEY" means: 
+*	a document issued by LICENSOR that defines all parameters of the SOFTWARE Commercial License. Said document specifies the name of the licensed SOFTWARE, the name of LICENSEE, the license type, the agreed-upon number of AUTHORIZED USERS, an upper limit for the licensed SOFTWARE version or an expiration date, and a hash-code. The combination of these values allows LICENSEE to unlock the full functionality of a genuine copy of the SOFTWARE for intended commercial use.
 
 
 2. GRANT
 
-Subject to the terms of this AGREEMENT, the LICENSOR hereby grants the LICENSEE a worldwide, non-transferable, non-exclusive, non-sub-licensable, limited LICENSE that allows:
-•	the LICENSEE to distribute (an) ACTIVATION KEY(s) to AUTHORIZED USER(s);
-•	the LICENSEE and AUTHORIZED USER(s) to install the SOFTWARE on computer PCs where potential use of the SOFTWARE is restricted exclusively to AUTHORIZED USER(s);
-•	the LICENSEE and AUTHORIZED USER(s) to use an ACTIVATION KEY to unlock the SOFTWARE;
-•	AUTHORIZED USER(s) to use any version of the SOFTWARE in trial mode;
-•	AUTHORIZED USER(s) to use any version of the unlocked SOFTWARE that specifies a version number less than or equal to the version number denoted in the ACTIVATION KEY; if the ACTIVATION KEY does not denote a version number the AUTHORIZED USER is allowed to use any version of the SOFTWARE for a period of time that is limited by the expiration date specified in the ACTIVATION KEY;
-•	LICENSEE to make a copy of the SOFTWARE for archival purposes provided the copy contains all of the proprietary notices of the SOFTWARE.
+The SOFTWARE is handed over to LICENSEE for its intended use. The scope of the intended use permitted by this AGREEMENT depends on whether a SOFTWARE Non-Commercial License or a SOFTWARE Commercial License is agreed-upon. If a SOFTWARE Non-Commercial License is agreed-upon LICENSEE is allowed to use the SOFTWARE solely for non-commercial purposes. A purpose is non-commercial only if it is in no manner primarily intended for or directed toward commercial advantage or private monetary compensation.
+Examples of non-commercial purposes:
+*	you are using the SOFTWARE to work on open-source projects for free;
+*	you are a student and you are using the SOFTWARE for your academic projects;
+*	you are using the SOFTWARE in your spare time to work on the desktop application of your local football club for free.
+Examples of commercial purposes, i.e. when you will need a Commercial License:
+*	you are using the SOFTWARE to work on open-source as well as on your company's projects;
+*	you are a student and you are using the SOFTWARE for your work as a freelancer;
+*	you are using the SOFTWARE in your spare time to work on the desktop application of your local football club and you are getting paid for that.
+
+Subject to the terms of this AGREEMENT, LICENSOR hereby grants LICENSEE a worldwide, non-transferable, non-exclusive, non-sub-licensable, limited LICENSE that allows:
+*	LICENSEE to distribute (an) ACTIVATION KEY(s) to AUTHORIZED USER(s);
+*	LICENSEE and AUTHORIZED USER(s) to install the SOFTWARE on any number of computer PCs where potential use of the full functionality of the SOFTWARE is restricted exclusively to AUTHORIZED USER(s);
+*	LICENSEE and AUTHORIZED USER(s) to use the command-line interface of the SOFTWARE without unlocking the full functionality of the SOFTWARE;
+*	LICENSEE and AUTHORIZED USER(s) to use an ACTIVATION KEY to unlock the full functionality of the SOFTWARE for intended commercial use;
+*	LICENSEE and AUTHORIZED USER(s) to truthfully declare their intend to solely use the SOFTWARE for non-commercial purposes to unlock the full functionality of the SOFTWARE for intended non-commercial use;
+*	AUTHORIZED USER(s) to apply any version of the unlocked SOFTWARE that specifies a version number less than or equal to the version number denoted in the ACTIVATION KEY to the permitted intended use. If the ACTIVATION KEY does not denote a version number, the AUTHORIZED USER is allowed to use any version of the SOFTWARE for a period of time that is limited by the expiration date specified in the ACTIVATION KEY;
+*	LICENSEE to make a copy of the SOFTWARE for archival purposes provided the copy contains all of the proprietary notices of the SOFTWARE.
 
 
-3. RESTRICTIONS AND CONFIDENTIALITY
+3. RESTRICTIONS
 
-The LICENSEE will not, and will have no right to:
-•	modify, translate, reverse engineer, decompile, disassemble (except to the extent applicable laws specifically prohibit such restriction), create derivative works based on, or otherwise attempt to discover the source code or underlying ideas or algorithms of the SOFTWARE;
-•	sell, rent, lease, distribute, or otherwise transfer rights to the SOFTWARE without prior written consent from LICENSOR;
-•	remove any proprietary notices or labels from the SOFTWARE;
-•	distribute, use, or transfer an ACTIVATION KEY(s) that has been superseded by an ACTIVATION KEY(s) provided with software maintenance.
-AUTHORIZED USER(s) will not, and will have no right to:
-•	use an unlocked version of the SOFTWARE that exceeds the version string specified in the ACTIVATION KEY; 
-•	use the trial mode of the SOFTWARE for any commercial purposes; 
-•	use a Private/Academic License of the software for any commercial purposes.
-Unless a valid non-disclosure agreement exists between the Parties, in which case the terms of that non-disclosure agreement shall apply, the following terms shall: Except as necessary for its performance under the AGREEMENT or required by law, the LICENSOR shall not disclose to anyone any information furnished by the LICENSEE that is marked as confidential or proprietary.
+LICENSEE and AUTHORIZED USER(s) will not, and will have no right to:
+*	modify, translate, reverse engineer, decompile, disassemble (except to the extent applicable laws specifically prohibit such restriction), create derivative works based on, or otherwise attempt to discover the source code or underlying ideas or algorithms of the SOFTWARE;
+*	sell, rent, lease, distribute, or otherwise transfer rights to the SOFTWARE without prior written consent from LICENSOR;
+*	remove any proprietary notices or labels from the SOFTWARE;
+*	distribute, use, or transfer an ACTIVATION KEY(s) that has been superseded by an ACTIVATION KEY(s) provided with software maintenance.
 
-4. TITLE AND COPYRIGHT
+
+4. CONFIDENTIALITY
+
+The SOFTWARE contains a feature that will automatically connect to LICENSOR's servers to check for a new program version. The data sent in this process contains NO POTENTIALLY SENSITIVE INFORMATION. The user can opt-out from this feature.
+Unless a valid non-disclosure agreement exists between the Parties, in which case the terms of that non-disclosure agreement shall apply, the following terms shall: Except as necessary for its performance under the AGREEMENT or required by law, LICENSOR shall not disclose to anyone any information furnished by LICENSEE that is marked as confidential or proprietary.
+
+
+5. TITLE AND COPYRIGHT
 
 Title, ownership rights, intellectual property rights, and copyright to the SOFTWARE, and any copies or portions thereof, shall remain in LICENSOR. The SOFTWARE is protected by European copyright directives, Austrian copyright laws as well as United States copyright laws and international treaty provisions.
 
 
-5. DISCLAIMER OF WARRANTY
+6. DISCLAIMER OF WARRANTY
 
 THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND. LICENSOR HEREBY DISCLAIMS ALL EXPRESS OR IMPLIED WARRANTIES, INCLUDING WITHOUT LIMITATION WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS AGREEMENT. SOME U.S. STATES DO NOT ALLOW EXCLUSIONS OF AN IMPLIED WARRANTY, SO THIS DISCLAIMER MAY NOT APPLY TO LICENSEE. LICENSEE MAY HAVE OTHER LEGAL RIGHTS THAT VARY FROM STATE TO STATE OR BY JURISDICTION.
 
 
-6. LIMITATION OF LIABILITY
+7. LIMITATION OF LIABILITY
 
 LICENSEE ASSUMES THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE SOFTWARE. LICENSOR ASSUMES NO LIABILITY FOR THE COST OF ANY SERVICE OR REPAIR IF THE SOFTWARE IS DEFECTIVE. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, TORT, CONTRACT, STRICT LIABILITY, OR OTHERWISE, SHALL LICENSOR, OR ITS LICENSORS, SUPPLIERS OR RESELLERS, BE LIABLE TO LICENSEE OR ANY OTHER PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES. IN NO EVENT WILL LICENSOR BE LIABLE FOR ANY DAMAGES IN EXCESS OF THE MONEY PAID FOR THE SOFTWARE, EVEN IF LICENSOR SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES, OR FOR ANY CLAIM BY ANY OTHER PARTY. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. FURTHERMORE, SOME U.S. STATES DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS LIMITATION AND EXCLUSION MAY NOT APPLY TO LICENSEE.
 
 
-7. TERMINATION
+8. TERMINATION
 
-The license granted herein shall be perpetual. If LICENSEE fails to comply with any of the terms of this AGREEMENT, this AGREEMENT and the rights granted herein will terminate immediately. LICENSOR may, at its sole discretion and at any time, terminate this AGREEMENT. On termination, LICENSEE must cease using and destroy all copies of the SOFTWARE.
+The LICENSE granted herein shall be perpetual. If LICENSEE fails to comply with any of the terms of this AGREEMENT, this AGREEMENT and the rights granted herein will terminate immediately. As such the Non-Commercial LICENSE terminates automatically if the usage of SOFTWARE becomes commercial. LICENSOR may, at its sole discretion and at any time, terminate this AGREEMENT. On termination, LICENSEE must cease using and destroy all copies of the SOFTWARE.
 
 
-8. EXPORT CONTROLS
+9. EXPORT CONTROLS
 
-LICENSEE shall comply with all export laws, restrictions and regulations of the United States, the Directive 2009/428/EC of the European Parliament and of the Council and the Austrian Außenwirtschaftsgesetz 2011, BGBl I No. 26/2011. LICENSEE shall not export, re-export or otherwise transfer the SOFTWARE to any country for which the United States or the European Union or Austria maintains an embargo, or to any person or entity on the U.S. Department of Treasury List of Specially Designated Nationals or the U.S. Department of Commerce Denied Persons List or Entity List. LICENSEE represents and warrants that licensee is not located in, under the control of, or a national or resident of any restricted country or on any such list.
+LICENSEE shall comply with all export laws, restrictions and regulations of the United States, the Directive 2009/428/EC of the European Parliament and of the Council and the Austrian Außenwirtschaftsgesetz 2011, BGBl I No. 26/2011. LICENSEE shall not export, re-export or otherwise transfer the SOFTWARE to any country for which the United States or the European Union or Austria maintains an embargo, or to any person or entity on the U.S. Department of Treasury List of Specially Designated Nationals or the U.S. Department of Commerce Denied Persons List or Entity List. LICENSEE represents and warrants that LICENSEE is not located in, under the control of, or a national or resident of any restricted country or on any such list.
 
 
-9. THIRD PARTY CREDITS
+10. YOUR RESPONSIBILITIES.  
+
+LICENSEE agrees to immediately notify LICENSOR in writing of any misuse, misappropriation or unauthorized use, disclosure, display or copying of the SOFTWARE that may come to LICENSEE's attention. In addition, LICENSEE agrees to defend, indemnify and hold LICENSOR, its suppliers and any of its directors, officers, employees or affiliates of any of the foregoing harmless from any and all claims resulting from or arising out of LICENSEE's use of the Software or breach of this AGREEMENT.
+
+
+11. THIRD PARTY CREDITS
 
 Portions of the SOFTWARE utilize or include third party software and other copyrighted materials. Credits, licensing terms, and disclaimers for such materials are contained in the installation directory for the SOFTWARE, and are accessible via the “3rd Party Licenses” dialog for the SOFTWARE. LICENSEE agrees that use of such copyrighted materials is governed by their respective terms.
 
 
-10. ENTIRE AGREEMENT
+12. SEVERABILITY
 
-This AGREEMENT represents the complete agreement concerning this SOFTWARE between the PARTIES and supersedes all prior agreements and representations between them. It may be amended only in writing executed by both PARTIES. Coati Software OG reserves the exclusive right to periodically update this AGREEMENT at its discretion at any time, with reasonable notice to LICENSEE by posting the new AGREEMENT at the following URL: <https://www.sourcetrail.com/terms-of-use>. Any action arising out of or relating to this AGREEMENT may be brought exclusively in Salzburg, Austria, and the PARTIES irrevocably consent to the jurisdiction of such courts and venue in Salzburg, Austria.
+If a particular term of this AGREEMENT is not enforceable, the unenforceability of that term will not affect any other terms of this AGREEMENT.
+
+
+13. HEADINGS
+
+The section headings used herein are for convenience only and do not affect the interpretation of this AGREEMENT.
+
+ 
+14. NO WAIVER
+
+LICENSOR's failure to enforce or exercise any part of this AGREEMENT is not a waiver of that part.
+
+
+15. ENTIRE AGREEMENT
+
+This AGREEMENT represents the complete agreement concerning this SOFTWARE between the PARTIES and supersedes all prior agreements and representations between them. It may be amended only in writing executed by both PARTIES. The inclusion of LICENSEE's own terms and conditions is contradicted, unless their validity has explicitly been agreed to. LICENSOR reserves the exclusive right to update this AGREEMENT for new SOFTWARE versions. By using these new SOFTWARE versions the new AGREEMENT supersedes any older one. Any action arising out of or relating to this AGREEMENT may be brought exclusively in Salzburg, Austria, and the PARTIES irrevocably consent to the jurisdiction of such courts and venue in Salzburg, Austria.
 
 
 CONTACT
 
-If you have questions regarding this agreement, contact:
-Coati Software OG
+If you have questions regarding this AGREEMENT, contact:
+Coati Software KG
 Jakob-Haringer-Straße 1/127
 5020 Salzburg
 Austria

bin/app/data/gui/license/license.css

@@ -1,3 +1,11 @@
+#title {
+	margin-left: 265px;
+}
+
+#licenseOption {
+	font-weight: bold;
+}
+
 #licenseField {
 	font-family: "<setting:font_name>";
 	font-size: 11px;
@@ -6,6 +14,10 @@
 	width: 470px;
 }
 
+#licenseField:disabled {
+	background: #F5F5F5;
+}
+
 #licenseError {
 	color: red;
 }

bin/app/data/gui/main.css

@@ -1,6 +0,0 @@
-QToolTip {
-	background-color: #E0E0E0;
-	color: black;
-	font-size: <setting:font_size>px;
-}
-

bin/app/data/gui/main/main.css

@@ -0,0 +1,57 @@
+QToolTip {
+	background-color: #E0E0E0;
+	color: black;
+	font-size: <setting:font_size>px;
+}
+
+QPushButton {
+	outline: none;
+}
+
+QMainWindow::separator {
+	background: <color:window/separator>;
+	width: 1px;
+}
+
+QDockWidget {
+	color: <color:window/dock/text>;
+	font-size: 10pt;
+	titlebar-close-icon: url(<setting:gui_path>main/images/close_<color:window/dock/icon_type>.png);
+	titlebar-normal-icon: url(<setting:gui_path>main/images/float_<color:window/dock/icon_type>.png);
+}
+
+QDockWidget::title {
+	border-bottom: 1px solid <color:window/dock/line>;
+	background: <color:window/dock/background>;
+	text-align: center;
+	padding-top: 1px;
+}
+
+QDockWidget::close-button, QDockWidget::float-button {
+	background: transparent;
+	border: <platform_wml:0|0|1>px solid transparent;
+	icon-size: 12px;
+	margin-top: <platform_wml:0|2|2>px;
+}
+
+QDockWidget::close-button {
+	margin-left: <platform_wml:0|2|0>px;
+}
+
+QDockWidget::float-button {
+	margin-right: <platform_wml:0|2|0>px;
+}
+
+#screen_button {
+	background-color: <color:window/button/background>;
+	border: 1px solid <color:window/button/border>;
+	border-radius: 5px;
+	color: <color:window/button/text>;
+	font-size: <setting:font_size>px;
+	padding: 4px 6px;
+	margin: 2px 0px;
+}
+
+#screen_button:hover {
+	border: 1px solid <color:window/button/border_hover>;
+}

bin/app/data/gui/main/scrollbar.css

@@ -0,0 +1,62 @@
+QScrollBar:vertical, QScrollBar:horizontal {
+	background: <color:window/scrollbar/background>;
+	border: none;
+	margin: 0px;
+}
+
+QScrollBar:vertical {
+	width: 15px;
+	border-left: 1px solid <color:window/scrollbar/line>;
+}
+
+QScrollBar:horizontal {
+	height: 15px;
+	border-top: 1px solid <color:window/scrollbar/line>;
+}
+
+QScrollBar::handle:vertical, QScrollBar::handle:horizontal {
+	background: <color:window/scrollbar/handle>;
+	border: none;
+	border-radius: 4px;
+}
+
+QScrollBar::handle:vertical {
+	width: 8px;
+	min-height: 16px;
+	margin: 4px 3px;
+}
+
+QScrollBar::handle:horizontal {
+	height: 8px;
+	min-width: 16px;
+	margin: 3px 4px;
+}
+
+QScrollBar::add-line:vertical, QScrollBar::add-line:horizontal {
+	background: transparent;
+	border: none;
+	height: 0px;
+	width: 0px;
+	subcontrol-position: bottom;
+	subcontrol-origin: margin;
+}
+
+QScrollBar::sub-line:vertical, QScrollBar::sub-line:horizontal {
+	background: transparent;
+	border: none;
+	height: 0px;
+	width: 0px;
+	subcontrol-position: top;
+	subcontrol-origin: margin;
+}
+
+QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal, QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical {
+	background: none;
+}
+
+QAbstractScrollArea::corner {
+    background: transparent;
+    border: none;
+    border-left: 1px solid <color:window/scrollbar/line>;
+    border-top: 1px solid <color:window/scrollbar/line>;
+}

bin/app/data/gui/search_view/search_view.css

@@ -13,7 +13,7 @@
 
 QWidget#search_box_container {
 	background: <color:search/field/background>;
-	border: none;
+	border: 2px solid <color:search/field/border>;
 	border-bottom-left-radius: 12px;
 	border-top-left-radius: 12px;
 	margin-left: 5px;
@@ -24,7 +24,6 @@ QLineEdit#search_box {
 	background-color: transparent;
 	border: none;
 	color: <color:search/field/text>;
-	margin-left: 5px;
 	selection-background-color: <color:search/field/highlight>;
 }
 

bin/app/data/gui/startscreen/startscreen.css

@@ -42,7 +42,7 @@
 	font-weight: bold;
 }
 
-#updateButton {
+#updateButton, #upgradeButton {
 	margin: 1px 0 3px;
 	text-align: left;
 	padding: 0;
@@ -53,7 +53,7 @@
 	text-decoration: underline;
 }
 
-#updateButton:disabled {
+#updateButton:disabled, #upgradeButton:disabled {
 	color: black;
 	text-decoration: none;
 }

bin/app/data/gui/tabbed_view/tabbed_view.css

@@ -1,50 +1,55 @@
+QTabWidget::pane {
+	background-color: <color:tab/background>;
+	border-top: <setting:font_size+15>px solid <color:tab/bar/background>;
+	top: -<setting:font_size+15>px;
+}
+
 QTabWidget::tab-bar {
 	alignment: left;
+	left: 7px;
+	bottom: -1px;
 }
 
 QTabBar::tab {
-	background-color: <color:tab/background>;
-	color: <color:tab/text>;
-	padding: 12px 75px 5px 12px;
-	border: 0px;
-	border-bottom: 4px solid <color:tab/background>;
-	/*font-size: <setting:font_size>px;*/
-	/*font-weight: bold;*/
+	background-color: <color:tab/bar/button/background/normal>;
+	border: 1px solid <color:tab/bar/border>;
+	border-top-left-radius: 7px;
+	border-top-right-radius: 7px;
+	color: <color:tab/bar/button/text>;
+	font-size: <setting:font_size>px;
+	height: <setting:font_size+8>;
+	margin-left: 3px;
+	margin-top: 4px;
+	width: 100px;
 }
 
 QTabBar::tab:hover {
-	border-bottom: 4px solid <color:tab/hover>;
+	background-color: <color:tab/bar/button/background/hover>;
 }
 
-QTabBar::tab:selected {
-	border-bottom: 4px solid <color:tab/active>;
-	color: <color:tab/active>;
+QTabBar::tab:selected, QTabBar::tab:pressed {
+	background-color:  <color:tab/bar/button/background/press>;
+	border-bottom: 1px solid <color:tab/bar/button/background/press>;
 }
 
-QTabWidget::pane {
-	top: 0px;
-	background: <color:tab/background>;
-	color: <color:tab/text>;
-	border: 0px;
-	margin: 0px;
-	padding: 0px;
+QTabWidget #tab_content {
+	border-top: 1px solid <color:tab/bar/border>;
+	background-color: <color:tab/background>;
 }
 
+
 QTableView {
 	color: <color:table/text/normal>;
 	background-color: <color:table/table_line_1/normal>;
 	alternate-background-color: <color:table/table_line_2/normal>;
-	border-radius: 10px;
+	border-radius: 7px;
+	border-bottom-left-radius: 2px;
+	border-bottom-right-radius: 2px;
 	border: 1px solid <color:table/table>;
 	margin: 10px 10px 2px;
-	padding-right: 10px;
 	font-size: <setting:font_size>px;
 }
 
-QFrame {
-	background-color: <color:tab/background>;
-}
-
 QTableView::item {
 	border-left: 1px solid <color:table/table>;
 }
@@ -59,6 +64,14 @@ QHeaderView {
 	background-color: transparent;
 }
 
+QHeaderView::up-arrow {
+	image: url(<setting:gui_path>tabbed_view/arrow_up.png);
+}
+
+QHeaderView::down-arrow {
+	image: url(<setting:gui_path>tabbed_view/arrow_down.png);
+}
+
 QHeaderView::section:horizontal {
 	background-color: transparent;
 	border: none;
@@ -67,7 +80,7 @@ QHeaderView::section:horizontal {
 	color: <color:table/text/normal>;
 	font-size: <setting:font_size>px;
 	font-weight: bold;
-	padding: 1px 6px;
+	padding: 2px 6px 1px;
 	height: <setting:font_size+5>px;
 }
 
@@ -76,48 +89,21 @@ QHeaderView::section:vertical {
 	border: none;
 	color: <color:table/text/normal>;
 	font-size: <setting:font_size>px;
-	padding-right: 5px;
-	padding-left: 5px;
-}
-
-
-QCheckBox {
-	color: <color:table/text/normal>;
-	border-color: <color:table/table>;
-	margin: 0;
-	/*background-color: <color:table/table>;*/
-}
-
-QScrollBar:vertical {
-}
-
-QScrollBar::handle:vertical {
-	min-height: 20px;
-}
-
-QScrollBar::add-line:vertical {
-	height: 20px;
-	subcontrol-position: bottom;
-	subcontrol-origin: margin;
-}
-
-QScrollBar::sub-line:vertical {
-	height: 20px;
-	subcontrol-position: top;
-	subcontrol-origin: margin;
-}
-QScrollBar::up-arrow:vertical, QScrollBar::down-arrow:vertical {
-	width: 3px;
-	height: 3px;
-	background: white;
-}
-
-QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical {
-	background: none;
+	padding: 2px 5px 1px;
 }
 
 QTableView QTableCornerButton::section {
 	background-color: <color:table/background>;
 	border-bottom: 1px solid <color:table/table>;
-	border-top-left-radius: 10px;
+	border-top-left-radius: 7px;
+}
+
+QCheckBox {
+	color: <color:table/text/normal>;
+	font-size: <setting:font_size>px;
+}
+
+#help_button {
+	background: transparent;
+	border: none;
 }

bin/app/data/gui/window/listbox.css

@@ -2,7 +2,7 @@
 	font-size: 12px;
 }
 
-QtDirectoryListBox {
+QtListBox {
 	background-color: white;
 	border: 1px solid lightgray;
 	border-radius: 12px;
@@ -11,7 +11,7 @@ QtDirectoryListBox {
 QListWidget {
 	background: transparent;
 	border: none;
-	margin: 2px 0 2px 0;
+	margin: 2px 0 0 0;
 }
 
 QListWidget::item {
@@ -23,7 +23,7 @@ QListWidget::item:selected {
 	background-color: #EEE;
 }
 
-QtListItemWidget #field {
+QtListBoxItem #field {
 	background-color: transparent;
 	border: none;
 	color: black;
@@ -31,11 +31,15 @@ QtListItemWidget #field {
 	margin-left: 5px;
 }
 
+QtListBoxItem #field:disabled {
+	color: grey;
+}
+
 #bar {
 	border-top: 1px solid lightgray;
 }
 
-#iconButton, #dotsButton, #plusButton, #minusButton, #editButton {
+#helpButton, #dotsButton, #plusButton, #minusButton, #editButton {
 	border: none;
 	color: white;
 	height: 1em;

bin/app/data/gui/window/window.css

@@ -72,7 +72,7 @@ QCheckBox:disabled {
 	background: transparent;
 }
 
-#iconButton, #dotsButton {
+#helpButton, #dotsButton {
 	border: none;
 	color: white;
 	height: 1em;

bin/app/data/java/gradle/init.gradle

@@ -1,41 +1,53 @@
 allprojects { pp ->
-	task printMainSrcDirs << {
-		if (project.hasProperty("sourceSets")) {
-			project.sourceSets.main.java.srcDirs.each { dir ->
-			   println "${dir}"
-		   }
+	task printMainSrcDirs {
+		doLast {
+			if (project.hasProperty("sourceSets")) {
+				if (project.sourceSets.hasProperty("main")) {
+					project.sourceSets.main.java.srcDirs.each { dir ->
+						println "${dir}"
+					}
+				}
+			}
 		}
 	}
 
-	task printTestSrcDirs << {
-		if (project.hasProperty("sourceSets")) {
-			project.sourceSets.test.java.srcDirs.each { dir ->
-			   println "${dir}"
+	task printTestSrcDirs {
+		doLast {
+			if (project.hasProperty("sourceSets")) {
+				if (project.sourceSets.hasProperty("test")) {
+					project.sourceSets.test.java.srcDirs.each { dir ->
+						println "${dir}"
+					}
+				}
 			}
 		}
 	}
 	
-	task copyCompileLibs << {
-		File rootDir = pp.getRootDir()
-		String destination = project.hasProperty('sourcetrail_lib_path') ? project.property('sourcetrail_lib_path').replace("\"", "") : rootDir.getPath() + rootDir.separator + "lib"
-		println destination;
-		if (pp.configurations.hasProperty("compile")) {
-			copy {
-				into destination
-				from pp.configurations.compile
-				eachFile { println "copying file \"" + it.file.name + "\" to \"" + destination + "\"" }
+	task copyCompileLibs {
+		doLast {
+			File rootDir = pp.getRootDir()
+			String destination = project.hasProperty('sourcetrail_lib_path') ? project.property('sourcetrail_lib_path').replace("\"", "") : rootDir.getPath() + rootDir.separator + "lib"
+			println destination;
+			if (pp.configurations.hasProperty("compile")) {
+				copy {
+					into destination
+					from pp.configurations.compile
+					eachFile { println "copying file \"" + it.file.name + "\" to \"" + destination + "\"" }
+				}
 			}
 		}
 	}
 	
-	task copyTestCompileLibs << {
-		File rootDir = pp.getRootDir()
-		String destination = project.hasProperty('sourcetrail_lib_path') ? project.property('sourcetrail_lib_path') : rootDir.getPath() + rootDir.separator + "lib"
-		if (pp.configurations.hasProperty("testCompile")) {
-			copy {
-				into destination
-				from pp.configurations.testCompile
-				eachFile { println "copying file \"" + it.file.name + "\" to \"" + destination + "\"" }
+	task copyTestCompileLibs {
+		doLast {
+			File rootDir = pp.getRootDir()
+			String destination = project.hasProperty('sourcetrail_lib_path') ? project.property('sourcetrail_lib_path') : rootDir.getPath() + rootDir.separator + "lib"
+			if (pp.configurations.hasProperty("testCompile")) {
+				copy {
+					into destination
+					from pp.configurations.testCompile
+					eachFile { println "copying file \"" + it.file.name + "\" to \"" + destination + "\"" }
+				}
 			}
 		}
 	}

bin/app/user/ApplicationSettings_template.xml

@@ -21,6 +21,7 @@
 		<font_size_std><!-- INTEGER: standard font size in pt --></font_size_std>
 
 		<use_animations><!-- BOOL: define if animations are used --></use_animations>
+		<builtin_types_in_graph><!-- BOOL: if the graph shows built-in types when referenced --></builtin_types_in_graph>
 
 		<window_base_width><!-- INTEGER: initial width of an overlay window --></window_base_width>
 		<window_base_height><!-- INTEGER: initial height of an overlay window --></window_base_height>
@@ -28,10 +29,17 @@
 		<scroll_speed><!-- DECIMAL: multiplier for default scroll speed in views --></scroll_speed>
 
 		<logging_enabled><!-- BOOL: define if console and file logging is enabled --></logging_enabled>
+		<verbose_indexer_logging_enabled><!-- BOOL: define if verbose indexer logging is enabled --></verbose_indexer_logging_enabled>
 
 		<graph_controls_visible><!-- BOOL: define if the graph controls are visible or collapsed --></graph_controls_visible>
+		<graph_grouping><!-- STRING: group type name --></graph_grouping>
 	</application>
 
+	<screen>
+		<auto_scaling><!-- INTEGER: 0 or 1 if auto scaling is enabled, -1 for system setting --></auto_scaling>
+		<scale_factor><!-- DECIMAL: defines highDPI scale factor, < 0 uses system setting --></scale_factor>
+	</screen>
+
 	<indexing>
 		<indexer_thread_count><!-- INTEGER: number of threads indexing the source code --></indexer_thread_count>
 		<multi_process_indexing><!-- BOOL: use different processes instead of threads during indexing --></multi_process_indexing>
@@ -76,6 +84,7 @@
 		<license>
 			<check><!-- STRING: hashed path of the working directory used when entering the license key --></check>
 			<license><!-- STRING: the license key --></license>
+			<non_commercial_use><!-- BOOL: if used non-commercially --></non_commercial_use>
 		</license>
 
 		<accepted_eula_version><!-- INTEGER: last accepted eula version --></accepted_eula_version>
@@ -89,6 +98,8 @@
 			<update_url><!-- STRING: url to new version download --></update_url>
 			<update_version><!-- VERSION: version of last check --></update_version>
 		</update_check>
+
+		<seen_error_help_message><!-- BOOL: whether user has been shown help message on errors after indexing --></seen_error_help_message>
 	</user>
 
 	<network>

bin/app/user/projects/javaparser/javaparser.srctrlprj

@@ -26,9 +26,10 @@
                 <source_path>./target/generated-sources/javacc</source_path>
             </source_paths>
             <standard>8</standard>
+            <status>enabled</status>
             <type>Java Source Group</type>
             <use_jre_system_library>1</use_jre_system_library>
         </source_group_7a9e75fc-2cad-42d5-8c5b-c86d02f7b4e4>
     </source_groups>
-    <version>4</version>
+    <version>5</version>
 </config>

bin/app/user/projects/tictactoe/tictactoe.srctrlprj

@@ -12,7 +12,6 @@
                 <target_options_enabled>0</target_options_enabled>
             </cross_compilation>
             <name>TicTacToe Source Group</name>
-            <should_apply_anonymous_typedef_transformation>1</should_apply_anonymous_typedef_transformation>
             <source_extensions>
                 <source_extension>.cpp</source_extension>
                 <source_extension>.cxx</source_extension>
@@ -22,9 +21,10 @@
             <source_paths>
                 <source_path>./src</source_path>
             </source_paths>
-            <standard>c++1z</standard>
+            <standard>c++2a</standard>
+            <status>enabled</status>
             <type>C++ Source Group</type>
         </source_group_afdfade2-4b42-49a6-961a-d4a563f2cf84>
     </source_groups>
-    <version>4</version>
+    <version>5</version>
 </config>

bin/app/user/projects/tutorial/src/code_tutorial_1.h

@@ -8,15 +8,20 @@
 //------------------------------------------------------------------------------
 //
 // 1 - THE CODE TUTORIAL
-//  As you already know the Code View displays the snippets of code that are 
-//  related to your currently active symbol. These snippets show the relevant 
-//  lines in combination with some context. 
+//  As you already know the Code View displays the snippets of code that are
+//  related to your currently active symbol. These snippets show the relevant
+//  lines in combination with some context.
 //  In case you discover something interesting as part of the snippet's context
-//  you can activate that symbol with a left-click. That way you dig deeper 
+//  you can activate that symbol with a left-click. That way you dig deeper
 //  through your code base.
-//  Have you ever wondered what's the meaning of life, the universe and 
+//  Have you ever wondered what's the meaning of life, the universe and
 //  everything? Click the respective symbol to find out.
 //
+// NOTE:
+//  This tutorial is based on the snippet view of Sourcetrail's Code View.
+//  Please click the button "snippet list mode" in the top right corner of the
+//  Code View.
+//
 //------------------------------------------------------------------------------
 
 class CodeTutorial
@@ -25,7 +30,7 @@ public:
 	CodeTutorial()
 	{
 	}
-	
+
 	static int meaning_of_life_the_universe_and_everything;
 };
 

bin/app/user/projects/tutorial/src/code_tutorial_3.h

@@ -47,9 +47,8 @@ void function_with_snippets()
 //  to the central hub.
 //
 // P.S.
-//  You can also click the file name above (i guess you need to scroll up a
-//  little bit) to activate the file's node in case you want to explore your
-//  include hierarchy.
+//  You can also click the file name above to activate the file's node in case you
+//  want to explore your include hierarchy.
 //
 //------------------------------------------------------------------------------
 

bin/app/user/projects/tutorial/tutorial.srctrlprj

@@ -27,16 +27,16 @@
                 <target_options_enabled>0</target_options_enabled>
             </cross_compilation>
             <name>Tutorial Source Group</name>
-            <should_apply_anonymous_typedef_transformation>1</should_apply_anonymous_typedef_transformation>
             <source_extensions>
                 <source_extension>.cpp</source_extension>
             </source_extensions>
             <source_paths>
                 <source_path>./src</source_path>
             </source_paths>
-            <standard>c++1z</standard>
+            <standard>c++2a</standard>
+            <status>enabled</status>
             <type>C++ Source Group</type>
         </source_group_75041cb3-37c8-45c6-bb8a-1b8b79040f59>
     </source_groups>
-    <version>4</version>
+    <version>5</version>
 </config>

bin/test/data/ConfigManagerTestSuite/test_data.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<config>
+    <path>
+        <to>
+            <special_character>ü</special_character>
+        </to>
+    </path>
+</config>

bin/test/data/CxxIncludeProcessingTestSuite/test_header_search_path_detection_does_not_find_path_relative_to_including_file/a.cpp

@@ -0,0 +1 @@
+#include "a.h"

bin/test/data/CxxIncludeProcessingTestSuite/test_header_search_path_detection_finds_path_included_in_future_header_search_path/a.cpp

@@ -0,0 +1 @@
+#include "a.h"

bin/test/data/CxxIncludeProcessingTestSuite/test_header_search_path_detection_finds_path_included_in_future_header_search_path/include_a/a.h

@@ -0,0 +1 @@
+#include "b.h"

bin/test/data/CxxIncludeProcessingTestSuite/test_header_search_path_detection_finds_path_included_in_header_search_path/a.cpp

@@ -0,0 +1 @@
+#include "a.h"

bin/test/data/CxxIncludeProcessingTestSuite/test_header_search_path_detection_finds_path_included_in_header_search_path/include_a/a.h

@@ -0,0 +1 @@
+#include "b.h"

bin/test/data/CxxIncludeProcessingTestSuite/test_header_search_path_detection_finds_path_inside_sub_directory/a.cpp

@@ -0,0 +1 @@
+#include "a.h"

bin/test/data/CxxIncludeProcessingTestSuite/test_header_search_path_detection_finds_path_relative_to_sub_directory/a.cpp

@@ -0,0 +1 @@
+#include "../a.h"

bin/test/data/CxxIndexSampleProjectsTestSuite/Box2D/expected_output/Box2D_Common_b2BlockAllocator.txt

@@ -1,5 +1,99 @@
 FILE: b2BlockAllocator.cpp
 COMMENT: comment [b2BlockAllocator.cpp <1:1 17:3>]
+REFERENCE_INCLUDE b2BlockAllocator.cpp -> b2BlockAllocator.h [b2BlockAllocator.cpp <19:10 19:42>]
+FILE: b2BlockAllocator.h
+COMMENT: comment [b2BlockAllocator.h <1:1 17:3>]
+REFERENCE_MACRO_USAGE b2BlockAllocator.h -> B2_BLOCK_ALLOCATOR_H [b2BlockAllocator.h <19:9 19:28>]
+SYMBOL_MACRO B2_BLOCK_ALLOCATOR_H [b2BlockAllocator.h <20:9 <20:9 20:28> 20:8>]
+REFERENCE_INCLUDE b2BlockAllocator.h -> b2Settings.h [b2BlockAllocator.h <22:10 22:36>]
+FILE: b2Settings.h
+COMMENT: comment [b2Settings.h <1:1 17:3>]
+REFERENCE_MACRO_USAGE b2Settings.h -> B2_SETTINGS_H [b2Settings.h <19:9 19:21>]
+SYMBOL_MACRO B2_SETTINGS_H [b2Settings.h <20:9 <20:9 20:21> 20:8>]
+REFERENCE_MACRO_USAGE b2Settings.h -> NDEBUG [b2Settings.h <26:14 26:19>]
+SYMBOL_MACRO b2DEBUG [b2Settings.h <27:10 <27:10 27:16> 27:9>]
+SYMBOL_MACRO B2_NOT_USED [b2Settings.h <30:9 <30:9 30:19> 30:33>]
+SYMBOL_MACRO b2Assert [b2Settings.h <31:9 <31:9 31:16> 31:28>]
+SYMBOL_MACRO b2_maxFloat [b2Settings.h <42:9 <42:9 42:19> 42:21>]
+SYMBOL_MACRO b2_epsilon [b2Settings.h <43:9 <43:9 43:18> 43:20>]
+SYMBOL_MACRO b2_pi [b2Settings.h <44:9 <44:9 44:13> 44:16>]
+COMMENT: comment [b2Settings.h <46:1 46:10>]
+COMMENT: comment [b2Settings.h <47:1 47:75>]
+COMMENT: comment [b2Settings.h <48:1 48:4>]
+COMMENT: comment [b2Settings.h <50:1 50:13>]
+COMMENT: comment [b2Settings.h <52:1 52:71>]
+COMMENT: comment [b2Settings.h <53:1 53:27>]
+SYMBOL_MACRO b2_maxManifoldPoints [b2Settings.h <54:9 <54:9 54:28> 54:29>]
+COMMENT: comment [b2Settings.h <56:1 56:76>]
+COMMENT: comment [b2Settings.h <57:1 57:70>]
+SYMBOL_MACRO b2_maxPolygonVertices [b2Settings.h <58:9 <58:9 58:29> 58:30>]
+COMMENT: comment [b2Settings.h <60:1 60:74>]
+COMMENT: comment [b2Settings.h <61:1 61:68>]
+COMMENT: comment [b2Settings.h <62:1 62:23>]
+SYMBOL_MACRO b2_aabbExtension [b2Settings.h <63:9 <63:9 63:24> 63:26>]
+COMMENT: comment [b2Settings.h <65:1 65:78>]
+COMMENT: comment [b2Settings.h <66:1 66:59>]
+COMMENT: comment [b2Settings.h <67:1 67:40>]
+SYMBOL_MACRO b2_aabbMultiplier [b2Settings.h <68:9 <68:9 68:25> 68:27>]
+COMMENT: comment [b2Settings.h <70:1 70:79>]
+COMMENT: comment [b2Settings.h <71:1 71:70>]
+SYMBOL_MACRO b2_linearSlop [b2Settings.h <72:9 <72:9 72:21> 72:24>]
+COMMENT: comment [b2Settings.h <74:1 74:78>]
+COMMENT: comment [b2Settings.h <75:1 75:70>]
+SYMBOL_MACRO b2_angularSlop [b2Settings.h <76:9 <76:9 76:22> 76:47>]
+COMMENT: comment [b2Settings.h <78:1 78:83>]
+COMMENT: comment [b2Settings.h <79:1 79:91>]
+COMMENT: comment [b2Settings.h <80:1 80:64>]
+SYMBOL_MACRO b2_polygonRadius [b2Settings.h <81:9 <81:9 81:24> 81:47>]
+COMMENT: comment [b2Settings.h <83:1 83:78>]
+SYMBOL_MACRO b2_maxSubSteps [b2Settings.h <84:9 <84:9 84:22> 84:25>]
+COMMENT: comment [b2Settings.h <87:1 87:12>]
+COMMENT: comment [b2Settings.h <89:1 89:68>]
+SYMBOL_MACRO b2_maxTOIContacts [b2Settings.h <90:9 <90:9 90:25> 90:28>]
+COMMENT: comment [b2Settings.h <92:1 92:86>]
+COMMENT: comment [b2Settings.h <93:1 93:64>]
+SYMBOL_MACRO b2_velocityThreshold [b2Settings.h <94:9 <94:9 94:28> 94:30>]
+COMMENT: comment [b2Settings.h <96:1 96:88>]
+COMMENT: comment [b2Settings.h <97:1 97:23>]
+SYMBOL_MACRO b2_maxLinearCorrection [b2Settings.h <98:9 <98:9 98:30> 98:32>]
+COMMENT: comment [b2Settings.h <100:1 100:89>]
+COMMENT: comment [b2Settings.h <101:1 101:23>]
+SYMBOL_MACRO b2_maxAngularCorrection [b2Settings.h <102:9 <102:9 102:31> 102:55>]
+COMMENT: comment [b2Settings.h <104:1 104:80>]
+COMMENT: comment [b2Settings.h <105:1 105:70>]
+SYMBOL_MACRO b2_maxTranslation [b2Settings.h <106:9 <106:9 106:25> 106:28>]
+SYMBOL_MACRO b2_maxTranslationSquared [b2Settings.h <107:9 <107:9 107:32> 107:71>]
+COMMENT: comment [b2Settings.h <109:1 109:81>]
+COMMENT: comment [b2Settings.h <110:1 110:70>]
+SYMBOL_MACRO b2_maxRotation [b2Settings.h <111:9 <111:9 111:22> 111:39>]
+SYMBOL_MACRO b2_maxRotationSquared [b2Settings.h <112:9 <112:9 112:29> 112:63>]
+COMMENT: comment [b2Settings.h <114:1 114:88>]
+COMMENT: comment [b2Settings.h <115:1 115:89>]
+COMMENT: comment [b2Settings.h <116:1 116:18>]
+SYMBOL_MACRO b2_baumgarte [b2Settings.h <117:9 <117:9 117:20> 117:24>]
+SYMBOL_MACRO b2_toiBaugarte [b2Settings.h <118:9 <118:9 118:22> 118:26>]
+COMMENT: comment [b2Settings.h <121:1 121:9>]
+COMMENT: comment [b2Settings.h <123:1 123:67>]
+SYMBOL_MACRO b2_timeToSleep [b2Settings.h <124:9 <124:9 124:22> 124:26>]
+COMMENT: comment [b2Settings.h <126:1 126:72>]
+SYMBOL_MACRO b2_linearSleepTolerance [b2Settings.h <127:9 <127:9 127:31> 127:33>]
+COMMENT: comment [b2Settings.h <129:1 129:73>]
+SYMBOL_MACRO b2_angularSleepTolerance [b2Settings.h <130:9 <130:9 130:32> 130:55>]
+COMMENT: comment [b2Settings.h <132:1 132:21>]
+COMMENT: comment [b2Settings.h <134:1 134:62>]
+COMMENT: comment [b2Settings.h <137:1 137:71>]
+COMMENT: comment [b2Settings.h <140:1 140:22>]
+COMMENT: comment [b2Settings.h <143:1 143:30>]
+COMMENT: comment [b2Settings.h <144:1 144:57>]
+COMMENT: comment [b2Settings.h <147:16 147:40>]
+COMMENT: comment [b2Settings.h <148:16 148:40>]
+COMMENT: comment [b2Settings.h <149:19 149:33>]
+COMMENT: comment [b2Settings.h <152:1 152:21>]
+COMMENT: comment [b2BlockAllocator.h <32:1 32:63>]
+COMMENT: comment [b2BlockAllocator.h <33:1 33:54>]
+COMMENT: comment [b2BlockAllocator.h <34:1 34:72>]
+COMMENT: comment [b2BlockAllocator.h <41:2 41:88>]
+COMMENT: comment [b2BlockAllocator.h <44:2 44:83>]
 COMMENT: comment [b2BlockAllocator.cpp <26:7 26:11>]
 COMMENT: comment [b2BlockAllocator.cpp <27:7 27:11>]
 COMMENT: comment [b2BlockAllocator.cpp <28:7 28:11>]
@@ -17,11 +111,6 @@ COMMENT: comment [b2BlockAllocator.cpp <39:7 39:12>]
 REFERENCE_MACRO_USAGE b2BlockAllocator.cpp -> b2Assert [b2BlockAllocator.cpp <57:2 57:9>]
 REFERENCE_MACRO_USAGE b2BlockAllocator.cpp -> UCHAR_MAX [b2BlockAllocator.cpp <57:27 57:35>]
 REFERENCE_MACRO_USAGE b2Settings.h -> assert [b2Settings.h <31:21 31:26>]
-REFERENCE_MACRO_USAGE assert.h -> _CRT_WIDE [assert.h <34:23 34:31>]
-REFERENCE_MACRO_USAGE vcruntime.h -> _CRT_WIDE_ [vcruntime.h <95:22 95:31>]
-REFERENCE_MACRO_USAGE assert.h -> _CRT_WIDE [assert.h <34:47 34:55>]
-REFERENCE_MACRO_USAGE assert.h -> __FILE__ [assert.h <34:57 34:64>]
-REFERENCE_MACRO_USAGE assert.h -> __LINE__ [assert.h <34:79 34:86>]
 REFERENCE_MACRO_USAGE b2BlockAllocator.cpp -> b2Assert [b2BlockAllocator.cpp <71:4 71:11>]
 REFERENCE_MACRO_USAGE b2BlockAllocator.cpp -> b2Assert [b2BlockAllocator.cpp <102:2 102:9>]
 REFERENCE_MACRO_USAGE b2BlockAllocator.cpp -> b2Assert [b2BlockAllocator.cpp <110:2 110:9>]
@@ -30,6 +119,97 @@ REFERENCE_MACRO_USAGE b2BlockAllocator.cpp -> b2Assert [b2BlockAllocator.cpp <13
 REFERENCE_MACRO_USAGE b2BlockAllocator.cpp -> b2Assert [b2BlockAllocator.cpp <162:2 162:9>]
 REFERENCE_MACRO_USAGE b2BlockAllocator.cpp -> b2Assert [b2BlockAllocator.cpp <171:2 171:9>]
 REFERENCE_MACRO_USAGE b2BlockAllocator.cpp -> _DEBUG [b2BlockAllocator.cpp <173:8 173:13>]
+SYMBOL_TYPEDEF int8 [b2Settings.h <33:21 33:24>]
+SYMBOL_BUILTIN_TYPE signed char
+REFERENCE_TYPE_USAGE int8 -> signed char [b2Settings.h <33:9 33:14>]
+SYMBOL_TYPEDEF int16 [b2Settings.h <34:22 34:26>]
+SYMBOL_BUILTIN_TYPE short
+REFERENCE_TYPE_USAGE int16 -> short [b2Settings.h <34:9 34:14>]
+SYMBOL_TYPEDEF int32 [b2Settings.h <35:20 35:24>]
+SYMBOL_BUILTIN_TYPE int
+REFERENCE_TYPE_USAGE int32 -> int [b2Settings.h <35:9 35:14>]
+SYMBOL_TYPEDEF uint8 [b2Settings.h <36:23 36:27>]
+SYMBOL_BUILTIN_TYPE unsigned char
+REFERENCE_TYPE_USAGE uint8 -> unsigned char [b2Settings.h <36:9 36:16>]
+SYMBOL_TYPEDEF uint16 [b2Settings.h <37:24 37:29>]
+SYMBOL_BUILTIN_TYPE unsigned short
+REFERENCE_TYPE_USAGE uint16 -> unsigned short [b2Settings.h <37:9 37:16>]
+SYMBOL_TYPEDEF uint32 [b2Settings.h <38:22 38:27>]
+SYMBOL_BUILTIN_TYPE unsigned int
+REFERENCE_TYPE_USAGE uint32 -> unsigned int [b2Settings.h <38:9 38:16>]
+SYMBOL_TYPEDEF float32 [b2Settings.h <39:15 39:21>]
+SYMBOL_BUILTIN_TYPE float
+REFERENCE_TYPE_USAGE float32 -> float [b2Settings.h <39:9 39:13>]
+SYMBOL_TYPEDEF float64 [b2Settings.h <40:16 40:22>]
+SYMBOL_BUILTIN_TYPE double
+REFERENCE_TYPE_USAGE float64 -> double [b2Settings.h <40:9 40:14>]
+SYMBOL_FUNCTION void * b2Alloc(int32) [b2Settings.h <135:7 135:13>]
+SYMBOL_BUILTIN_TYPE void
+REFERENCE_TYPE_USAGE void * b2Alloc(int32) -> void [b2Settings.h <135:1 135:4>]
+LOCAL_SYMBOL: b2Settings.h<135:21> [b2Settings.h <135:21 135:24>]
+REFERENCE_TYPE_USAGE void * b2Alloc(int32) -> int32 [b2Settings.h <135:15 135:19>]
+SYMBOL_FUNCTION void b2Free(void *) [b2Settings.h <138:6 138:11>]
+REFERENCE_TYPE_USAGE void b2Free(void *) -> void [b2Settings.h <138:1 138:4>]
+LOCAL_SYMBOL: b2Settings.h<138:19> [b2Settings.h <138:19 138:21>]
+REFERENCE_TYPE_USAGE void b2Free(void *) -> void [b2Settings.h <138:13 138:16>]
+SYMBOL_FUNCTION void b2Log(const char *) [b2Settings.h <141:6 141:10>]
+REFERENCE_TYPE_USAGE void b2Log(const char *) -> void [b2Settings.h <141:1 141:4>]
+LOCAL_SYMBOL: b2Settings.h<141:24> [b2Settings.h <141:24 141:29>]
+SYMBOL_BUILTIN_TYPE char
+REFERENCE_TYPE_USAGE void b2Log(const char *) -> char [b2Settings.h <141:18 141:21>]
+SYMBOL_STRUCT b2Version [b2Settings.h <145:1 <145:8 145:16> 150:1>]
+SYMBOL_FIELD public int32 b2Version::major [b2Settings.h <147:8 147:12>]
+REFERENCE_TYPE_USAGE int32 b2Version::major -> int32 [b2Settings.h <147:2 147:6>]
+SYMBOL_FIELD public int32 b2Version::minor [b2Settings.h <148:8 148:12>]
+REFERENCE_TYPE_USAGE int32 b2Version::minor -> int32 [b2Settings.h <148:2 148:6>]
+SYMBOL_FIELD public int32 b2Version::revision [b2Settings.h <149:8 149:15>]
+REFERENCE_TYPE_USAGE int32 b2Version::revision -> int32 [b2Settings.h <149:2 149:6>]
+SYMBOL_GLOBAL_VARIABLE b2Version b2_version [b2Settings.h <153:18 153:27>]
+REFERENCE_TYPE_USAGE b2Version b2_version -> b2Version [b2Settings.h <153:8 153:16>]
+SYMBOL_GLOBAL_VARIABLE const int32 b2_chunkSize [b2BlockAllocator.h <24:13 24:24>]
+REFERENCE_TYPE_USAGE const int32 b2_chunkSize -> int32 [b2BlockAllocator.h <24:7 24:11>]
+SYMBOL_GLOBAL_VARIABLE const int32 b2_maxBlockSize [b2BlockAllocator.h <25:13 25:27>]
+REFERENCE_TYPE_USAGE const int32 b2_maxBlockSize -> int32 [b2BlockAllocator.h <25:7 25:11>]
+SYMBOL_GLOBAL_VARIABLE const int32 b2_blockSizes [b2BlockAllocator.h <26:13 26:25>]
+REFERENCE_TYPE_USAGE const int32 b2_blockSizes -> int32 [b2BlockAllocator.h <26:7 26:11>]
+SYMBOL_GLOBAL_VARIABLE const int32 b2_chunkArrayIncrement [b2BlockAllocator.h <27:13 27:34>]
+REFERENCE_TYPE_USAGE const int32 b2_chunkArrayIncrement -> int32 [b2BlockAllocator.h <27:7 27:11>]
+SYMBOL_STRUCT b2Block [b2BlockAllocator.h <29:8 29:14>]
+SYMBOL_STRUCT b2Chunk [b2BlockAllocator.h <30:8 30:14>]
+SYMBOL_CLASS b2BlockAllocator [b2BlockAllocator.h <35:1 <35:7 35:22> 60:1>]
+SYMBOL_METHOD public void b2BlockAllocator::b2BlockAllocator() [b2BlockAllocator.h <38:2 38:17>]
+SYMBOL_METHOD public void b2BlockAllocator::~b2BlockAllocator() [b2BlockAllocator.h <39:2 39:18>]
+SYMBOL_METHOD public void * b2BlockAllocator::Allocate(int32) [b2BlockAllocator.h <42:8 42:15>]
+REFERENCE_TYPE_USAGE void * b2BlockAllocator::Allocate(int32) -> void [b2BlockAllocator.h <42:2 42:5>]
+LOCAL_SYMBOL: b2BlockAllocator.h<42:23> [b2BlockAllocator.h <42:23 42:26>]
+REFERENCE_TYPE_USAGE void * b2BlockAllocator::Allocate(int32) -> int32 [b2BlockAllocator.h <42:17 42:21>]
+SYMBOL_METHOD public void b2BlockAllocator::Free(void *, int32) [b2BlockAllocator.h <45:7 45:10>]
+REFERENCE_TYPE_USAGE void b2BlockAllocator::Free(void *, int32) -> void [b2BlockAllocator.h <45:2 45:5>]
+LOCAL_SYMBOL: b2BlockAllocator.h<45:18> [b2BlockAllocator.h <45:18 45:18>]
+REFERENCE_TYPE_USAGE void b2BlockAllocator::Free(void *, int32) -> void [b2BlockAllocator.h <45:12 45:15>]
+LOCAL_SYMBOL: b2BlockAllocator.h<45:27> [b2BlockAllocator.h <45:27 45:30>]
+REFERENCE_TYPE_USAGE void b2BlockAllocator::Free(void *, int32) -> int32 [b2BlockAllocator.h <45:21 45:25>]
+SYMBOL_METHOD public void b2BlockAllocator::Clear() [b2BlockAllocator.h <47:7 47:11>]
+REFERENCE_TYPE_USAGE void b2BlockAllocator::Clear() -> void [b2BlockAllocator.h <47:2 47:5>]
+SYMBOL_FIELD private b2Chunk * b2BlockAllocator::m_chunks [b2BlockAllocator.h <51:11 51:18>]
+REFERENCE_TYPE_USAGE b2Chunk * b2BlockAllocator::m_chunks -> b2Chunk [b2BlockAllocator.h <51:2 51:8>]
+SYMBOL_FIELD private int32 b2BlockAllocator::m_chunkCount [b2BlockAllocator.h <52:8 52:19>]
+REFERENCE_TYPE_USAGE int32 b2BlockAllocator::m_chunkCount -> int32 [b2BlockAllocator.h <52:2 52:6>]
+SYMBOL_FIELD private int32 b2BlockAllocator::m_chunkSpace [b2BlockAllocator.h <53:8 53:19>]
+REFERENCE_TYPE_USAGE int32 b2BlockAllocator::m_chunkSpace -> int32 [b2BlockAllocator.h <53:2 53:6>]
+SYMBOL_FIELD private b2Block * [] b2BlockAllocator::m_freeLists [b2BlockAllocator.h <55:11 55:21>]
+REFERENCE_TYPE_USAGE b2Block * [] b2BlockAllocator::m_freeLists -> b2Block [b2BlockAllocator.h <55:2 55:8>]
+REFERENCE_USAGE b2Block * [] b2BlockAllocator::m_freeLists -> const int32 b2_blockSizes [b2BlockAllocator.h <55:23 55:35>]
+SYMBOL_FIELD private static int32 [] b2BlockAllocator::s_blockSizes [b2BlockAllocator.h <57:15 57:26>]
+REFERENCE_TYPE_USAGE static int32 [] b2BlockAllocator::s_blockSizes -> int32 [b2BlockAllocator.h <57:9 57:13>]
+REFERENCE_USAGE static int32 [] b2BlockAllocator::s_blockSizes -> const int32 b2_blockSizes [b2BlockAllocator.h <57:28 57:40>]
+SYMBOL_FIELD private static uint8 [] b2BlockAllocator::s_blockSizeLookup [b2BlockAllocator.h <58:15 58:31>]
+REFERENCE_TYPE_USAGE static uint8 [] b2BlockAllocator::s_blockSizeLookup -> uint8 [b2BlockAllocator.h <58:9 58:13>]
+REFERENCE_USAGE static uint8 [] b2BlockAllocator::s_blockSizeLookup -> const int32 b2_maxBlockSize [b2BlockAllocator.h <58:33 58:47>]
+SYMBOL_FIELD private static bool b2BlockAllocator::s_blockSizeLookupInitialized [b2BlockAllocator.h <59:14 59:41>]
+SYMBOL_BUILTIN_TYPE bool
+REFERENCE_TYPE_USAGE static bool b2BlockAllocator::s_blockSizeLookupInitialized -> bool [b2BlockAllocator.h <59:9 59:12>]
+SYMBOL_METHOD public void b2BlockAllocator::b2BlockAllocator(const b2BlockAllocator &) [b2BlockAllocator.h <35:7 35:22>]
 SYMBOL_FIELD private static int32 [] b2BlockAllocator::s_blockSizes [b2BlockAllocator.cpp <24:25 24:36>]
 SYMBOL_CLASS b2BlockAllocator
 QUALIFIER: b2BlockAllocator [b2BlockAllocator.cpp <24:7 24:22>]
@@ -41,7 +221,6 @@ REFERENCE_TYPE_USAGE static uint8 [] b2BlockAllocator::s_blockSizeLookup -> uint
 REFERENCE_USAGE static uint8 [] b2BlockAllocator::s_blockSizeLookup -> const int32 b2_maxBlockSize [b2BlockAllocator.cpp <41:43 41:57>]
 SYMBOL_FIELD private static bool b2BlockAllocator::s_blockSizeLookupInitialized [b2BlockAllocator.cpp <42:24 42:51>]
 QUALIFIER: b2BlockAllocator [b2BlockAllocator.cpp <42:6 42:21>]
-SYMBOL_BUILTIN_TYPE bool
 REFERENCE_TYPE_USAGE static bool b2BlockAllocator::s_blockSizeLookupInitialized -> bool [b2BlockAllocator.cpp <42:1 42:4>]
 SYMBOL_STRUCT b2Chunk [b2BlockAllocator.cpp <44:1 <44:8 44:14> 48:1>]
 SYMBOL_FIELD public int32 b2Chunk::blockSize [b2BlockAllocator.cpp <46:8 46:16>]
@@ -53,7 +232,11 @@ SYMBOL_FIELD public b2Block * b2Block::next [b2BlockAllocator.cpp <52:11 52:14>]
 REFERENCE_TYPE_USAGE b2Block * b2Block::next -> b2Block [b2BlockAllocator.cpp <52:2 52:8>]
 SYMBOL_METHOD public void b2BlockAllocator::b2BlockAllocator() [b2BlockAllocator.cpp <55:1 <55:19 55:34> 85:1>]
 QUALIFIER: b2BlockAllocator [b2BlockAllocator.cpp <55:1 55:16>]
+REFERENCE_TYPE_USAGE void b2BlockAllocator::b2BlockAllocator() -> void [b2BlockAllocator.cpp <57:2 57:9>]
 REFERENCE_USAGE void b2BlockAllocator::b2BlockAllocator() -> const int32 b2_blockSizes [b2BlockAllocator.cpp <57:11 57:23>]
+SYMBOL_FUNCTION void _wassert(const wchar_t *, const wchar_t *, unsigned int)
+REFERENCE_CALL void b2BlockAllocator::b2BlockAllocator() -> void _wassert(const wchar_t *, const wchar_t *, unsigned int) [b2BlockAllocator.cpp <57:2 57:9>]
+REFERENCE_TYPE_USAGE void b2BlockAllocator::b2BlockAllocator() -> unsigned int [b2BlockAllocator.cpp <57:2 57:9>]
 REFERENCE_USAGE void b2BlockAllocator::b2BlockAllocator() -> int32 b2BlockAllocator::m_chunkSpace [b2BlockAllocator.cpp <59:2 59:13>]
 REFERENCE_USAGE void b2BlockAllocator::b2BlockAllocator() -> const int32 b2_chunkArrayIncrement [b2BlockAllocator.cpp <59:17 59:38>]
 REFERENCE_USAGE void b2BlockAllocator::b2BlockAllocator() -> int32 b2BlockAllocator::m_chunkCount [b2BlockAllocator.cpp <60:2 60:13>]
@@ -79,8 +262,11 @@ REFERENCE_TYPE_USAGE void b2BlockAllocator::b2BlockAllocator() -> int32 [b2Block
 LOCAL_SYMBOL: b2BlockAllocator.cpp<69:14> [b2BlockAllocator.cpp <69:21 69:21>]
 REFERENCE_USAGE void b2BlockAllocator::b2BlockAllocator() -> const int32 b2_maxBlockSize [b2BlockAllocator.cpp <69:26 69:40>]
 LOCAL_SYMBOL: b2BlockAllocator.cpp<69:14> [b2BlockAllocator.cpp <69:45 69:45>]
+REFERENCE_TYPE_USAGE void b2BlockAllocator::b2BlockAllocator() -> void [b2BlockAllocator.cpp <71:4 71:11>]
 LOCAL_SYMBOL: b2BlockAllocator.cpp<68:9> [b2BlockAllocator.cpp <71:13 71:13>]
 REFERENCE_USAGE void b2BlockAllocator::b2BlockAllocator() -> const int32 b2_blockSizes [b2BlockAllocator.cpp <71:17 71:29>]
+REFERENCE_CALL void b2BlockAllocator::b2BlockAllocator() -> void _wassert(const wchar_t *, const wchar_t *, unsigned int) [b2BlockAllocator.cpp <71:4 71:11>]
+REFERENCE_TYPE_USAGE void b2BlockAllocator::b2BlockAllocator() -> unsigned int [b2BlockAllocator.cpp <71:4 71:11>]
 LOCAL_SYMBOL: b2BlockAllocator.cpp<69:14> [b2BlockAllocator.cpp <72:8 72:8>]
 REFERENCE_USAGE void b2BlockAllocator::b2BlockAllocator() -> static int32 [] b2BlockAllocator::s_blockSizes [b2BlockAllocator.cpp <72:13 72:24>]
 LOCAL_SYMBOL: b2BlockAllocator.cpp<68:9> [b2BlockAllocator.cpp <72:26 72:26>]
@@ -110,12 +296,14 @@ REFERENCE_CALL void b2BlockAllocator::~b2BlockAllocator() -> void b2Free(void *)
 REFERENCE_USAGE void b2BlockAllocator::~b2BlockAllocator() -> b2Chunk * b2BlockAllocator::m_chunks [b2BlockAllocator.cpp <94:9 94:16>]
 SYMBOL_METHOD public void * b2BlockAllocator::Allocate(int32) [b2BlockAllocator.cpp <97:1 <97:25 97:32> 153:1>]
 QUALIFIER: b2BlockAllocator [b2BlockAllocator.cpp <97:7 97:22>]
-SYMBOL_BUILTIN_TYPE void
 REFERENCE_TYPE_USAGE void * b2BlockAllocator::Allocate(int32) -> void [b2BlockAllocator.cpp <97:1 97:4>]
 LOCAL_SYMBOL: b2BlockAllocator.cpp<97:40> [b2BlockAllocator.cpp <97:40 97:43>]
 REFERENCE_TYPE_USAGE void * b2BlockAllocator::Allocate(int32) -> int32 [b2BlockAllocator.cpp <97:34 97:38>]
 LOCAL_SYMBOL: b2BlockAllocator.cpp<97:40> [b2BlockAllocator.cpp <99:6 99:9>]
+REFERENCE_TYPE_USAGE void * b2BlockAllocator::Allocate(int32) -> void [b2BlockAllocator.cpp <102:2 102:9>]
 LOCAL_SYMBOL: b2BlockAllocator.cpp<97:40> [b2BlockAllocator.cpp <102:15 102:18>]
+REFERENCE_CALL void * b2BlockAllocator::Allocate(int32) -> void _wassert(const wchar_t *, const wchar_t *, unsigned int) [b2BlockAllocator.cpp <102:2 102:9>]
+REFERENCE_TYPE_USAGE void * b2BlockAllocator::Allocate(int32) -> unsigned int [b2BlockAllocator.cpp <102:2 102:9>]
 LOCAL_SYMBOL: b2BlockAllocator.cpp<97:40> [b2BlockAllocator.cpp <104:6 104:9>]
 REFERENCE_USAGE void * b2BlockAllocator::Allocate(int32) -> const int32 b2_maxBlockSize [b2BlockAllocator.cpp <104:13 104:27>]
 REFERENCE_CALL void * b2BlockAllocator::Allocate(int32) -> void * b2Alloc(int32) [b2BlockAllocator.cpp <106:10 106:16>]
@@ -124,9 +312,12 @@ LOCAL_SYMBOL: b2BlockAllocator.cpp<109:8> [b2BlockAllocator.cpp <109:8 109:12>]
 REFERENCE_TYPE_USAGE void * b2BlockAllocator::Allocate(int32) -> int32 [b2BlockAllocator.cpp <109:2 109:6>]
 REFERENCE_USAGE void * b2BlockAllocator::Allocate(int32) -> static uint8 [] b2BlockAllocator::s_blockSizeLookup [b2BlockAllocator.cpp <109:16 109:32>]
 LOCAL_SYMBOL: b2BlockAllocator.cpp<97:40> [b2BlockAllocator.cpp <109:34 109:37>]
+REFERENCE_TYPE_USAGE void * b2BlockAllocator::Allocate(int32) -> void [b2BlockAllocator.cpp <110:2 110:9>]
 LOCAL_SYMBOL: b2BlockAllocator.cpp<109:8> [b2BlockAllocator.cpp <110:16 110:20>]
 LOCAL_SYMBOL: b2BlockAllocator.cpp<109:8> [b2BlockAllocator.cpp <110:25 110:29>]
 REFERENCE_USAGE void * b2BlockAllocator::Allocate(int32) -> const int32 b2_blockSizes [b2BlockAllocator.cpp <110:33 110:45>]
+REFERENCE_CALL void * b2BlockAllocator::Allocate(int32) -> void _wassert(const wchar_t *, const wchar_t *, unsigned int) [b2BlockAllocator.cpp <110:2 110:9>]
+REFERENCE_TYPE_USAGE void * b2BlockAllocator::Allocate(int32) -> unsigned int [b2BlockAllocator.cpp <110:2 110:9>]
 REFERENCE_USAGE void * b2BlockAllocator::Allocate(int32) -> b2Block * [] b2BlockAllocator::m_freeLists [b2BlockAllocator.cpp <112:6 112:16>]
 LOCAL_SYMBOL: b2BlockAllocator.cpp<109:8> [b2BlockAllocator.cpp <112:18 112:22>]
 LOCAL_SYMBOL: b2BlockAllocator.cpp<114:12> [b2BlockAllocator.cpp <114:12 114:16>]
@@ -183,9 +374,12 @@ LOCAL_SYMBOL: b2BlockAllocator.cpp<137:9> [b2BlockAllocator.cpp <137:9 137:18>]
 REFERENCE_TYPE_USAGE void * b2BlockAllocator::Allocate(int32) -> int32 [b2BlockAllocator.cpp <137:3 137:7>]
 REFERENCE_USAGE void * b2BlockAllocator::Allocate(int32) -> const int32 b2_chunkSize [b2BlockAllocator.cpp <137:22 137:33>]
 LOCAL_SYMBOL: b2BlockAllocator.cpp<135:9> [b2BlockAllocator.cpp <137:37 137:45>]
+REFERENCE_TYPE_USAGE void * b2BlockAllocator::Allocate(int32) -> void [b2BlockAllocator.cpp <138:3 138:10>]
 LOCAL_SYMBOL: b2BlockAllocator.cpp<137:9> [b2BlockAllocator.cpp <138:12 138:21>]
 LOCAL_SYMBOL: b2BlockAllocator.cpp<135:9> [b2BlockAllocator.cpp <138:25 138:33>]
 REFERENCE_USAGE void * b2BlockAllocator::Allocate(int32) -> const int32 b2_chunkSize [b2BlockAllocator.cpp <138:38 138:49>]
+REFERENCE_CALL void * b2BlockAllocator::Allocate(int32) -> void _wassert(const wchar_t *, const wchar_t *, unsigned int) [b2BlockAllocator.cpp <138:3 138:10>]
+REFERENCE_TYPE_USAGE void * b2BlockAllocator::Allocate(int32) -> unsigned int [b2BlockAllocator.cpp <138:3 138:10>]
 LOCAL_SYMBOL: b2BlockAllocator.cpp<139:14> [b2BlockAllocator.cpp <139:14 139:14>]
 REFERENCE_TYPE_USAGE void * b2BlockAllocator::Allocate(int32) -> int32 [b2BlockAllocator.cpp <139:8 139:12>]
 LOCAL_SYMBOL: b2BlockAllocator.cpp<139:14> [b2BlockAllocator.cpp <139:21 139:21>]
@@ -236,7 +430,10 @@ REFERENCE_TYPE_USAGE void b2BlockAllocator::Free(void *, int32) -> void [b2Block
 LOCAL_SYMBOL: b2BlockAllocator.cpp<155:44> [b2BlockAllocator.cpp <155:44 155:47>]
 REFERENCE_TYPE_USAGE void b2BlockAllocator::Free(void *, int32) -> int32 [b2BlockAllocator.cpp <155:38 155:42>]
 LOCAL_SYMBOL: b2BlockAllocator.cpp<155:44> [b2BlockAllocator.cpp <157:6 157:9>]
+REFERENCE_TYPE_USAGE void b2BlockAllocator::Free(void *, int32) -> void [b2BlockAllocator.cpp <162:2 162:9>]
 LOCAL_SYMBOL: b2BlockAllocator.cpp<155:44> [b2BlockAllocator.cpp <162:15 162:18>]
+REFERENCE_CALL void b2BlockAllocator::Free(void *, int32) -> void _wassert(const wchar_t *, const wchar_t *, unsigned int) [b2BlockAllocator.cpp <162:2 162:9>]
+REFERENCE_TYPE_USAGE void b2BlockAllocator::Free(void *, int32) -> unsigned int [b2BlockAllocator.cpp <162:2 162:9>]
 LOCAL_SYMBOL: b2BlockAllocator.cpp<155:44> [b2BlockAllocator.cpp <164:6 164:9>]
 REFERENCE_USAGE void b2BlockAllocator::Free(void *, int32) -> const int32 b2_maxBlockSize [b2BlockAllocator.cpp <164:13 164:27>]
 REFERENCE_CALL void b2BlockAllocator::Free(void *, int32) -> void b2Free(void *) [b2BlockAllocator.cpp <166:3 166:8>]
@@ -245,9 +442,12 @@ LOCAL_SYMBOL: b2BlockAllocator.cpp<170:8> [b2BlockAllocator.cpp <170:8 170:12>]
 REFERENCE_TYPE_USAGE void b2BlockAllocator::Free(void *, int32) -> int32 [b2BlockAllocator.cpp <170:2 170:6>]
 REFERENCE_USAGE void b2BlockAllocator::Free(void *, int32) -> static uint8 [] b2BlockAllocator::s_blockSizeLookup [b2BlockAllocator.cpp <170:16 170:32>]
 LOCAL_SYMBOL: b2BlockAllocator.cpp<155:44> [b2BlockAllocator.cpp <170:34 170:37>]
+REFERENCE_TYPE_USAGE void b2BlockAllocator::Free(void *, int32) -> void [b2BlockAllocator.cpp <171:2 171:9>]
 LOCAL_SYMBOL: b2BlockAllocator.cpp<170:8> [b2BlockAllocator.cpp <171:16 171:20>]
 LOCAL_SYMBOL: b2BlockAllocator.cpp<170:8> [b2BlockAllocator.cpp <171:25 171:29>]
 REFERENCE_USAGE void b2BlockAllocator::Free(void *, int32) -> const int32 b2_blockSizes [b2BlockAllocator.cpp <171:33 171:45>]
+REFERENCE_CALL void b2BlockAllocator::Free(void *, int32) -> void _wassert(const wchar_t *, const wchar_t *, unsigned int) [b2BlockAllocator.cpp <171:2 171:9>]
+REFERENCE_TYPE_USAGE void b2BlockAllocator::Free(void *, int32) -> unsigned int [b2BlockAllocator.cpp <171:2 171:9>]
 LOCAL_SYMBOL: b2BlockAllocator.cpp<199:11> [b2BlockAllocator.cpp <199:11 199:15>]
 REFERENCE_TYPE_USAGE void b2BlockAllocator::Free(void *, int32) -> b2Block [b2BlockAllocator.cpp <199:2 199:8>]
 REFERENCE_TYPE_USAGE void b2BlockAllocator::Free(void *, int32) -> b2Block [b2BlockAllocator.cpp <199:20 199:26>]

bin/test/data/CxxIndexSampleProjectsTestSuite/Box2D/expected_output/Box2D_Common_b2Settings.txt

@@ -1,16 +1,143 @@
 FILE: b2Settings.cpp
 COMMENT: comment [b2Settings.cpp <1:1 17:3>]
+REFERENCE_INCLUDE b2Settings.cpp -> b2Settings.h [b2Settings.cpp <19:10 19:36>]
+FILE: b2Settings.h
+COMMENT: comment [b2Settings.h <1:1 17:3>]
+REFERENCE_MACRO_USAGE b2Settings.h -> B2_SETTINGS_H [b2Settings.h <19:9 19:21>]
+SYMBOL_MACRO B2_SETTINGS_H [b2Settings.h <20:9 <20:9 20:21> 20:8>]
+REFERENCE_MACRO_USAGE b2Settings.h -> NDEBUG [b2Settings.h <26:14 26:19>]
+SYMBOL_MACRO b2DEBUG [b2Settings.h <27:10 <27:10 27:16> 27:9>]
+SYMBOL_MACRO B2_NOT_USED [b2Settings.h <30:9 <30:9 30:19> 30:33>]
+SYMBOL_MACRO b2Assert [b2Settings.h <31:9 <31:9 31:16> 31:28>]
+SYMBOL_MACRO b2_maxFloat [b2Settings.h <42:9 <42:9 42:19> 42:21>]
+SYMBOL_MACRO b2_epsilon [b2Settings.h <43:9 <43:9 43:18> 43:20>]
+SYMBOL_MACRO b2_pi [b2Settings.h <44:9 <44:9 44:13> 44:16>]
+COMMENT: comment [b2Settings.h <46:1 46:10>]
+COMMENT: comment [b2Settings.h <47:1 47:75>]
+COMMENT: comment [b2Settings.h <48:1 48:4>]
+COMMENT: comment [b2Settings.h <50:1 50:13>]
+COMMENT: comment [b2Settings.h <52:1 52:71>]
+COMMENT: comment [b2Settings.h <53:1 53:27>]
+SYMBOL_MACRO b2_maxManifoldPoints [b2Settings.h <54:9 <54:9 54:28> 54:29>]
+COMMENT: comment [b2Settings.h <56:1 56:76>]
+COMMENT: comment [b2Settings.h <57:1 57:70>]
+SYMBOL_MACRO b2_maxPolygonVertices [b2Settings.h <58:9 <58:9 58:29> 58:30>]
+COMMENT: comment [b2Settings.h <60:1 60:74>]
+COMMENT: comment [b2Settings.h <61:1 61:68>]
+COMMENT: comment [b2Settings.h <62:1 62:23>]
+SYMBOL_MACRO b2_aabbExtension [b2Settings.h <63:9 <63:9 63:24> 63:26>]
+COMMENT: comment [b2Settings.h <65:1 65:78>]
+COMMENT: comment [b2Settings.h <66:1 66:59>]
+COMMENT: comment [b2Settings.h <67:1 67:40>]
+SYMBOL_MACRO b2_aabbMultiplier [b2Settings.h <68:9 <68:9 68:25> 68:27>]
+COMMENT: comment [b2Settings.h <70:1 70:79>]
+COMMENT: comment [b2Settings.h <71:1 71:70>]
+SYMBOL_MACRO b2_linearSlop [b2Settings.h <72:9 <72:9 72:21> 72:24>]
+COMMENT: comment [b2Settings.h <74:1 74:78>]
+COMMENT: comment [b2Settings.h <75:1 75:70>]
+SYMBOL_MACRO b2_angularSlop [b2Settings.h <76:9 <76:9 76:22> 76:47>]
+COMMENT: comment [b2Settings.h <78:1 78:83>]
+COMMENT: comment [b2Settings.h <79:1 79:91>]
+COMMENT: comment [b2Settings.h <80:1 80:64>]
+SYMBOL_MACRO b2_polygonRadius [b2Settings.h <81:9 <81:9 81:24> 81:47>]
+COMMENT: comment [b2Settings.h <83:1 83:78>]
+SYMBOL_MACRO b2_maxSubSteps [b2Settings.h <84:9 <84:9 84:22> 84:25>]
+COMMENT: comment [b2Settings.h <87:1 87:12>]
+COMMENT: comment [b2Settings.h <89:1 89:68>]
+SYMBOL_MACRO b2_maxTOIContacts [b2Settings.h <90:9 <90:9 90:25> 90:28>]
+COMMENT: comment [b2Settings.h <92:1 92:86>]
+COMMENT: comment [b2Settings.h <93:1 93:64>]
+SYMBOL_MACRO b2_velocityThreshold [b2Settings.h <94:9 <94:9 94:28> 94:30>]
+COMMENT: comment [b2Settings.h <96:1 96:88>]
+COMMENT: comment [b2Settings.h <97:1 97:23>]
+SYMBOL_MACRO b2_maxLinearCorrection [b2Settings.h <98:9 <98:9 98:30> 98:32>]
+COMMENT: comment [b2Settings.h <100:1 100:89>]
+COMMENT: comment [b2Settings.h <101:1 101:23>]
+SYMBOL_MACRO b2_maxAngularCorrection [b2Settings.h <102:9 <102:9 102:31> 102:55>]
+COMMENT: comment [b2Settings.h <104:1 104:80>]
+COMMENT: comment [b2Settings.h <105:1 105:70>]
+SYMBOL_MACRO b2_maxTranslation [b2Settings.h <106:9 <106:9 106:25> 106:28>]
+SYMBOL_MACRO b2_maxTranslationSquared [b2Settings.h <107:9 <107:9 107:32> 107:71>]
+COMMENT: comment [b2Settings.h <109:1 109:81>]
+COMMENT: comment [b2Settings.h <110:1 110:70>]
+SYMBOL_MACRO b2_maxRotation [b2Settings.h <111:9 <111:9 111:22> 111:39>]
+SYMBOL_MACRO b2_maxRotationSquared [b2Settings.h <112:9 <112:9 112:29> 112:63>]
+COMMENT: comment [b2Settings.h <114:1 114:88>]
+COMMENT: comment [b2Settings.h <115:1 115:89>]
+COMMENT: comment [b2Settings.h <116:1 116:18>]
+SYMBOL_MACRO b2_baumgarte [b2Settings.h <117:9 <117:9 117:20> 117:24>]
+SYMBOL_MACRO b2_toiBaugarte [b2Settings.h <118:9 <118:9 118:22> 118:26>]
+COMMENT: comment [b2Settings.h <121:1 121:9>]
+COMMENT: comment [b2Settings.h <123:1 123:67>]
+SYMBOL_MACRO b2_timeToSleep [b2Settings.h <124:9 <124:9 124:22> 124:26>]
+COMMENT: comment [b2Settings.h <126:1 126:72>]
+SYMBOL_MACRO b2_linearSleepTolerance [b2Settings.h <127:9 <127:9 127:31> 127:33>]
+COMMENT: comment [b2Settings.h <129:1 129:73>]
+SYMBOL_MACRO b2_angularSleepTolerance [b2Settings.h <130:9 <130:9 130:32> 130:55>]
+COMMENT: comment [b2Settings.h <132:1 132:21>]
+COMMENT: comment [b2Settings.h <134:1 134:62>]
+COMMENT: comment [b2Settings.h <137:1 137:71>]
+COMMENT: comment [b2Settings.h <140:1 140:22>]
+COMMENT: comment [b2Settings.h <143:1 143:30>]
+COMMENT: comment [b2Settings.h <144:1 144:57>]
+COMMENT: comment [b2Settings.h <147:16 147:40>]
+COMMENT: comment [b2Settings.h <148:16 148:40>]
+COMMENT: comment [b2Settings.h <149:19 149:33>]
+COMMENT: comment [b2Settings.h <152:1 152:21>]
 COMMENT: comment [b2Settings.cpp <26:1 26:62>]
 COMMENT: comment [b2Settings.cpp <37:1 37:53>]
 REFERENCE_MACRO_USAGE b2Settings.cpp -> va_start [b2Settings.cpp <41:2 41:9>]
-REFERENCE_MACRO_USAGE stdarg.h -> __crt_va_start [stdarg.h <17:18 17:31>]
-REFERENCE_MACRO_USAGE vadefs.h -> __crt_va_start_a [vadefs.h <149:96 149:111>]
 REFERENCE_MACRO_USAGE b2Settings.cpp -> va_end [b2Settings.cpp <43:2 43:7>]
-REFERENCE_MACRO_USAGE stdarg.h -> __crt_va_end [stdarg.h <19:18 19:29>]
+SYMBOL_TYPEDEF int8 [b2Settings.h <33:21 33:24>]
+SYMBOL_BUILTIN_TYPE signed char
+REFERENCE_TYPE_USAGE int8 -> signed char [b2Settings.h <33:9 33:14>]
+SYMBOL_TYPEDEF int16 [b2Settings.h <34:22 34:26>]
+SYMBOL_BUILTIN_TYPE short
+REFERENCE_TYPE_USAGE int16 -> short [b2Settings.h <34:9 34:14>]
+SYMBOL_TYPEDEF int32 [b2Settings.h <35:20 35:24>]
+SYMBOL_BUILTIN_TYPE int
+REFERENCE_TYPE_USAGE int32 -> int [b2Settings.h <35:9 35:14>]
+SYMBOL_TYPEDEF uint8 [b2Settings.h <36:23 36:27>]
+SYMBOL_BUILTIN_TYPE unsigned char
+REFERENCE_TYPE_USAGE uint8 -> unsigned char [b2Settings.h <36:9 36:16>]
+SYMBOL_TYPEDEF uint16 [b2Settings.h <37:24 37:29>]
+SYMBOL_BUILTIN_TYPE unsigned short
+REFERENCE_TYPE_USAGE uint16 -> unsigned short [b2Settings.h <37:9 37:16>]
+SYMBOL_TYPEDEF uint32 [b2Settings.h <38:22 38:27>]
+SYMBOL_BUILTIN_TYPE unsigned int
+REFERENCE_TYPE_USAGE uint32 -> unsigned int [b2Settings.h <38:9 38:16>]
+SYMBOL_TYPEDEF float32 [b2Settings.h <39:15 39:21>]
+SYMBOL_BUILTIN_TYPE float
+REFERENCE_TYPE_USAGE float32 -> float [b2Settings.h <39:9 39:13>]
+SYMBOL_TYPEDEF float64 [b2Settings.h <40:16 40:22>]
+SYMBOL_BUILTIN_TYPE double
+REFERENCE_TYPE_USAGE float64 -> double [b2Settings.h <40:9 40:14>]
+SYMBOL_FUNCTION void * b2Alloc(int32) [b2Settings.h <135:7 135:13>]
+SYMBOL_BUILTIN_TYPE void
+REFERENCE_TYPE_USAGE void * b2Alloc(int32) -> void [b2Settings.h <135:1 135:4>]
+LOCAL_SYMBOL: b2Settings.h<135:21> [b2Settings.h <135:21 135:24>]
+REFERENCE_TYPE_USAGE void * b2Alloc(int32) -> int32 [b2Settings.h <135:15 135:19>]
+SYMBOL_FUNCTION void b2Free(void *) [b2Settings.h <138:6 138:11>]
+REFERENCE_TYPE_USAGE void b2Free(void *) -> void [b2Settings.h <138:1 138:4>]
+LOCAL_SYMBOL: b2Settings.h<138:19> [b2Settings.h <138:19 138:21>]
+REFERENCE_TYPE_USAGE void b2Free(void *) -> void [b2Settings.h <138:13 138:16>]
+SYMBOL_FUNCTION void b2Log(const char *) [b2Settings.h <141:6 141:10>]
+REFERENCE_TYPE_USAGE void b2Log(const char *) -> void [b2Settings.h <141:1 141:4>]
+LOCAL_SYMBOL: b2Settings.h<141:24> [b2Settings.h <141:24 141:29>]
+SYMBOL_BUILTIN_TYPE char
+REFERENCE_TYPE_USAGE void b2Log(const char *) -> char [b2Settings.h <141:18 141:21>]
+SYMBOL_STRUCT b2Version [b2Settings.h <145:1 <145:8 145:16> 150:1>]
+SYMBOL_FIELD public int32 b2Version::major [b2Settings.h <147:8 147:12>]
+REFERENCE_TYPE_USAGE int32 b2Version::major -> int32 [b2Settings.h <147:2 147:6>]
+SYMBOL_FIELD public int32 b2Version::minor [b2Settings.h <148:8 148:12>]
+REFERENCE_TYPE_USAGE int32 b2Version::minor -> int32 [b2Settings.h <148:2 148:6>]
+SYMBOL_FIELD public int32 b2Version::revision [b2Settings.h <149:8 149:15>]
+REFERENCE_TYPE_USAGE int32 b2Version::revision -> int32 [b2Settings.h <149:2 149:6>]
+SYMBOL_GLOBAL_VARIABLE b2Version b2_version [b2Settings.h <153:18 153:27>]
+REFERENCE_TYPE_USAGE b2Version b2_version -> b2Version [b2Settings.h <153:8 153:16>]
 SYMBOL_GLOBAL_VARIABLE b2Version b2_version [b2Settings.cpp <24:11 24:20>]
 REFERENCE_TYPE_USAGE b2Version b2_version -> b2Version [b2Settings.cpp <24:1 24:9>]
 SYMBOL_FUNCTION void * b2Alloc(int32) [b2Settings.cpp <27:1 <27:7 27:13> 30:1>]
-SYMBOL_BUILTIN_TYPE void
 REFERENCE_TYPE_USAGE void * b2Alloc(int32) -> void [b2Settings.cpp <27:1 27:4>]
 LOCAL_SYMBOL: b2Settings.cpp<27:21> [b2Settings.cpp <27:21 27:24>]
 REFERENCE_TYPE_USAGE void * b2Alloc(int32) -> int32 [b2Settings.cpp <27:15 27:19>]
@@ -27,14 +154,20 @@ LOCAL_SYMBOL: b2Settings.cpp<32:19> [b2Settings.cpp <34:7 34:9>]
 SYMBOL_FUNCTION void b2Log(const char *) [b2Settings.cpp <38:1 <38:6 38:10> 44:1>]
 REFERENCE_TYPE_USAGE void b2Log(const char *) -> void [b2Settings.cpp <38:1 38:4>]
 LOCAL_SYMBOL: b2Settings.cpp<38:24> [b2Settings.cpp <38:24 38:29>]
-SYMBOL_BUILTIN_TYPE char
 REFERENCE_TYPE_USAGE void b2Log(const char *) -> char [b2Settings.cpp <38:18 38:21>]
 LOCAL_SYMBOL: b2Settings.cpp<40:10> [b2Settings.cpp <40:10 40:13>]
 REFERENCE_TYPE_USAGE void b2Log(const char *) -> va_list [b2Settings.cpp <40:2 40:8>]
+REFERENCE_TYPE_USAGE void b2Log(const char *) -> void [b2Settings.cpp <41:2 41:9>]
+SYMBOL_FUNCTION void __vcrt_va_start_verify_argument_type<const char *>()
+REFERENCE_CALL void b2Log(const char *) -> void __vcrt_va_start_verify_argument_type<const char *>() [b2Settings.cpp <41:2 41:9>]
 LOCAL_SYMBOL: b2Settings.cpp<38:24> [b2Settings.cpp <41:17 41:22>]
+SYMBOL_FUNCTION void __va_start(char * *)
+REFERENCE_CALL void b2Log(const char *) -> void __va_start(char * *) [b2Settings.cpp <41:2 41:9>]
 LOCAL_SYMBOL: b2Settings.cpp<40:10> [b2Settings.cpp <41:11 41:14>]
 SYMBOL_FUNCTION int vprintf(const char * const, va_list)
 REFERENCE_CALL void b2Log(const char *) -> int vprintf(const char * const, va_list) [b2Settings.cpp <42:2 42:8>]
 LOCAL_SYMBOL: b2Settings.cpp<38:24> [b2Settings.cpp <42:10 42:15>]
 LOCAL_SYMBOL: b2Settings.cpp<40:10> [b2Settings.cpp <42:18 42:21>]
+REFERENCE_TYPE_USAGE void b2Log(const char *) -> void [b2Settings.cpp <43:2 43:7>]
 LOCAL_SYMBOL: b2Settings.cpp<40:10> [b2Settings.cpp <43:9 43:12>]
+REFERENCE_TYPE_USAGE void b2Log(const char *) -> va_list [b2Settings.cpp <43:2 43:7>]

bin/test/data/CxxIndexSampleProjectsTestSuite/Box2D/expected_output/Box2D_Common_b2Timer.txt

@@ -1,8 +1,162 @@
 FILE: b2Timer.cpp
 COMMENT: comment [b2Timer.cpp <1:1 17:3>]
+REFERENCE_INCLUDE b2Timer.cpp -> b2Timer.h [b2Timer.cpp <19:10 19:33>]
+FILE: b2Timer.h
+COMMENT: comment [b2Timer.h <1:1 17:3>]
+REFERENCE_MACRO_USAGE b2Timer.h -> B2_TIMER_H [b2Timer.h <19:9 19:18>]
+SYMBOL_MACRO B2_TIMER_H [b2Timer.h <20:9 <20:9 20:18> 20:8>]
+REFERENCE_INCLUDE b2Timer.h -> b2Settings.h [b2Timer.h <22:10 22:36>]
+FILE: b2Settings.h
+COMMENT: comment [b2Settings.h <1:1 17:3>]
+REFERENCE_MACRO_USAGE b2Settings.h -> B2_SETTINGS_H [b2Settings.h <19:9 19:21>]
+SYMBOL_MACRO B2_SETTINGS_H [b2Settings.h <20:9 <20:9 20:21> 20:8>]
+REFERENCE_MACRO_USAGE b2Settings.h -> NDEBUG [b2Settings.h <26:14 26:19>]
+SYMBOL_MACRO b2DEBUG [b2Settings.h <27:10 <27:10 27:16> 27:9>]
+SYMBOL_MACRO B2_NOT_USED [b2Settings.h <30:9 <30:9 30:19> 30:33>]
+SYMBOL_MACRO b2Assert [b2Settings.h <31:9 <31:9 31:16> 31:28>]
+SYMBOL_MACRO b2_maxFloat [b2Settings.h <42:9 <42:9 42:19> 42:21>]
+SYMBOL_MACRO b2_epsilon [b2Settings.h <43:9 <43:9 43:18> 43:20>]
+SYMBOL_MACRO b2_pi [b2Settings.h <44:9 <44:9 44:13> 44:16>]
+COMMENT: comment [b2Settings.h <46:1 46:10>]
+COMMENT: comment [b2Settings.h <47:1 47:75>]
+COMMENT: comment [b2Settings.h <48:1 48:4>]
+COMMENT: comment [b2Settings.h <50:1 50:13>]
+COMMENT: comment [b2Settings.h <52:1 52:71>]
+COMMENT: comment [b2Settings.h <53:1 53:27>]
+SYMBOL_MACRO b2_maxManifoldPoints [b2Settings.h <54:9 <54:9 54:28> 54:29>]
+COMMENT: comment [b2Settings.h <56:1 56:76>]
+COMMENT: comment [b2Settings.h <57:1 57:70>]
+SYMBOL_MACRO b2_maxPolygonVertices [b2Settings.h <58:9 <58:9 58:29> 58:30>]
+COMMENT: comment [b2Settings.h <60:1 60:74>]
+COMMENT: comment [b2Settings.h <61:1 61:68>]
+COMMENT: comment [b2Settings.h <62:1 62:23>]
+SYMBOL_MACRO b2_aabbExtension [b2Settings.h <63:9 <63:9 63:24> 63:26>]
+COMMENT: comment [b2Settings.h <65:1 65:78>]
+COMMENT: comment [b2Settings.h <66:1 66:59>]
+COMMENT: comment [b2Settings.h <67:1 67:40>]
+SYMBOL_MACRO b2_aabbMultiplier [b2Settings.h <68:9 <68:9 68:25> 68:27>]
+COMMENT: comment [b2Settings.h <70:1 70:79>]
+COMMENT: comment [b2Settings.h <71:1 71:70>]
+SYMBOL_MACRO b2_linearSlop [b2Settings.h <72:9 <72:9 72:21> 72:24>]
+COMMENT: comment [b2Settings.h <74:1 74:78>]
+COMMENT: comment [b2Settings.h <75:1 75:70>]
+SYMBOL_MACRO b2_angularSlop [b2Settings.h <76:9 <76:9 76:22> 76:47>]
+COMMENT: comment [b2Settings.h <78:1 78:83>]
+COMMENT: comment [b2Settings.h <79:1 79:91>]
+COMMENT: comment [b2Settings.h <80:1 80:64>]
+SYMBOL_MACRO b2_polygonRadius [b2Settings.h <81:9 <81:9 81:24> 81:47>]
+COMMENT: comment [b2Settings.h <83:1 83:78>]
+SYMBOL_MACRO b2_maxSubSteps [b2Settings.h <84:9 <84:9 84:22> 84:25>]
+COMMENT: comment [b2Settings.h <87:1 87:12>]
+COMMENT: comment [b2Settings.h <89:1 89:68>]
+SYMBOL_MACRO b2_maxTOIContacts [b2Settings.h <90:9 <90:9 90:25> 90:28>]
+COMMENT: comment [b2Settings.h <92:1 92:86>]
+COMMENT: comment [b2Settings.h <93:1 93:64>]
+SYMBOL_MACRO b2_velocityThreshold [b2Settings.h <94:9 <94:9 94:28> 94:30>]
+COMMENT: comment [b2Settings.h <96:1 96:88>]
+COMMENT: comment [b2Settings.h <97:1 97:23>]
+SYMBOL_MACRO b2_maxLinearCorrection [b2Settings.h <98:9 <98:9 98:30> 98:32>]
+COMMENT: comment [b2Settings.h <100:1 100:89>]
+COMMENT: comment [b2Settings.h <101:1 101:23>]
+SYMBOL_MACRO b2_maxAngularCorrection [b2Settings.h <102:9 <102:9 102:31> 102:55>]
+COMMENT: comment [b2Settings.h <104:1 104:80>]
+COMMENT: comment [b2Settings.h <105:1 105:70>]
+SYMBOL_MACRO b2_maxTranslation [b2Settings.h <106:9 <106:9 106:25> 106:28>]
+SYMBOL_MACRO b2_maxTranslationSquared [b2Settings.h <107:9 <107:9 107:32> 107:71>]
+COMMENT: comment [b2Settings.h <109:1 109:81>]
+COMMENT: comment [b2Settings.h <110:1 110:70>]
+SYMBOL_MACRO b2_maxRotation [b2Settings.h <111:9 <111:9 111:22> 111:39>]
+SYMBOL_MACRO b2_maxRotationSquared [b2Settings.h <112:9 <112:9 112:29> 112:63>]
+COMMENT: comment [b2Settings.h <114:1 114:88>]
+COMMENT: comment [b2Settings.h <115:1 115:89>]
+COMMENT: comment [b2Settings.h <116:1 116:18>]
+SYMBOL_MACRO b2_baumgarte [b2Settings.h <117:9 <117:9 117:20> 117:24>]
+SYMBOL_MACRO b2_toiBaugarte [b2Settings.h <118:9 <118:9 118:22> 118:26>]
+COMMENT: comment [b2Settings.h <121:1 121:9>]
+COMMENT: comment [b2Settings.h <123:1 123:67>]
+SYMBOL_MACRO b2_timeToSleep [b2Settings.h <124:9 <124:9 124:22> 124:26>]
+COMMENT: comment [b2Settings.h <126:1 126:72>]
+SYMBOL_MACRO b2_linearSleepTolerance [b2Settings.h <127:9 <127:9 127:31> 127:33>]
+COMMENT: comment [b2Settings.h <129:1 129:73>]
+SYMBOL_MACRO b2_angularSleepTolerance [b2Settings.h <130:9 <130:9 130:32> 130:55>]
+COMMENT: comment [b2Settings.h <132:1 132:21>]
+COMMENT: comment [b2Settings.h <134:1 134:62>]
+COMMENT: comment [b2Settings.h <137:1 137:71>]
+COMMENT: comment [b2Settings.h <140:1 140:22>]
+COMMENT: comment [b2Settings.h <143:1 143:30>]
+COMMENT: comment [b2Settings.h <144:1 144:57>]
+COMMENT: comment [b2Settings.h <147:16 147:40>]
+COMMENT: comment [b2Settings.h <148:16 148:40>]
+COMMENT: comment [b2Settings.h <149:19 149:33>]
+COMMENT: comment [b2Settings.h <152:1 152:21>]
+COMMENT: comment [b2Timer.h <24:1 24:65>]
+COMMENT: comment [b2Timer.h <25:1 25:32>]
+COMMENT: comment [b2Timer.h <30:2 30:17>]
+COMMENT: comment [b2Timer.h <33:2 33:22>]
+COMMENT: comment [b2Timer.h <36:2 36:56>]
+REFERENCE_MACRO_USAGE b2Timer.h -> _WIN32 [b2Timer.h <41:13 41:18>]
 REFERENCE_MACRO_USAGE b2Timer.cpp -> _WIN32 [b2Timer.cpp <21:13 21:18>]
 REFERENCE_MACRO_USAGE b2Timer.cpp -> WIN32_LEAN_AND_MEAN [b2Timer.cpp <25:9 25:27>]
 SYMBOL_MACRO WIN32_LEAN_AND_MEAN [b2Timer.cpp <26:9 <26:9 26:27> 26:8>]
+SYMBOL_TYPEDEF int8 [b2Settings.h <33:21 33:24>]
+SYMBOL_BUILTIN_TYPE signed char
+REFERENCE_TYPE_USAGE int8 -> signed char [b2Settings.h <33:9 33:14>]
+SYMBOL_TYPEDEF int16 [b2Settings.h <34:22 34:26>]
+SYMBOL_BUILTIN_TYPE short
+REFERENCE_TYPE_USAGE int16 -> short [b2Settings.h <34:9 34:14>]
+SYMBOL_TYPEDEF int32 [b2Settings.h <35:20 35:24>]
+SYMBOL_BUILTIN_TYPE int
+REFERENCE_TYPE_USAGE int32 -> int [b2Settings.h <35:9 35:14>]
+SYMBOL_TYPEDEF uint8 [b2Settings.h <36:23 36:27>]
+SYMBOL_BUILTIN_TYPE unsigned char
+REFERENCE_TYPE_USAGE uint8 -> unsigned char [b2Settings.h <36:9 36:16>]
+SYMBOL_TYPEDEF uint16 [b2Settings.h <37:24 37:29>]
+SYMBOL_BUILTIN_TYPE unsigned short
+REFERENCE_TYPE_USAGE uint16 -> unsigned short [b2Settings.h <37:9 37:16>]
+SYMBOL_TYPEDEF uint32 [b2Settings.h <38:22 38:27>]
+SYMBOL_BUILTIN_TYPE unsigned int
+REFERENCE_TYPE_USAGE uint32 -> unsigned int [b2Settings.h <38:9 38:16>]
+SYMBOL_TYPEDEF float32 [b2Settings.h <39:15 39:21>]
+SYMBOL_BUILTIN_TYPE float
+REFERENCE_TYPE_USAGE float32 -> float [b2Settings.h <39:9 39:13>]
+SYMBOL_TYPEDEF float64 [b2Settings.h <40:16 40:22>]
+SYMBOL_BUILTIN_TYPE double
+REFERENCE_TYPE_USAGE float64 -> double [b2Settings.h <40:9 40:14>]
+SYMBOL_FUNCTION void * b2Alloc(int32) [b2Settings.h <135:7 135:13>]
+SYMBOL_BUILTIN_TYPE void
+REFERENCE_TYPE_USAGE void * b2Alloc(int32) -> void [b2Settings.h <135:1 135:4>]
+LOCAL_SYMBOL: b2Settings.h<135:21> [b2Settings.h <135:21 135:24>]
+REFERENCE_TYPE_USAGE void * b2Alloc(int32) -> int32 [b2Settings.h <135:15 135:19>]
+SYMBOL_FUNCTION void b2Free(void *) [b2Settings.h <138:6 138:11>]
+REFERENCE_TYPE_USAGE void b2Free(void *) -> void [b2Settings.h <138:1 138:4>]
+LOCAL_SYMBOL: b2Settings.h<138:19> [b2Settings.h <138:19 138:21>]
+REFERENCE_TYPE_USAGE void b2Free(void *) -> void [b2Settings.h <138:13 138:16>]
+SYMBOL_FUNCTION void b2Log(const char *) [b2Settings.h <141:6 141:10>]
+REFERENCE_TYPE_USAGE void b2Log(const char *) -> void [b2Settings.h <141:1 141:4>]
+LOCAL_SYMBOL: b2Settings.h<141:24> [b2Settings.h <141:24 141:29>]
+SYMBOL_BUILTIN_TYPE char
+REFERENCE_TYPE_USAGE void b2Log(const char *) -> char [b2Settings.h <141:18 141:21>]
+SYMBOL_STRUCT b2Version [b2Settings.h <145:1 <145:8 145:16> 150:1>]
+SYMBOL_FIELD public int32 b2Version::major [b2Settings.h <147:8 147:12>]
+REFERENCE_TYPE_USAGE int32 b2Version::major -> int32 [b2Settings.h <147:2 147:6>]
+SYMBOL_FIELD public int32 b2Version::minor [b2Settings.h <148:8 148:12>]
+REFERENCE_TYPE_USAGE int32 b2Version::minor -> int32 [b2Settings.h <148:2 148:6>]
+SYMBOL_FIELD public int32 b2Version::revision [b2Settings.h <149:8 149:15>]
+REFERENCE_TYPE_USAGE int32 b2Version::revision -> int32 [b2Settings.h <149:2 149:6>]
+SYMBOL_GLOBAL_VARIABLE b2Version b2_version [b2Settings.h <153:18 153:27>]
+REFERENCE_TYPE_USAGE b2Version b2_version -> b2Version [b2Settings.h <153:8 153:16>]
+SYMBOL_CLASS b2Timer [b2Timer.h <26:1 <26:7 26:13> 48:1>]
+SYMBOL_METHOD public void b2Timer::b2Timer() [b2Timer.h <31:2 31:8>]
+SYMBOL_METHOD public void b2Timer::Reset() [b2Timer.h <34:7 34:11>]
+REFERENCE_TYPE_USAGE void b2Timer::Reset() -> void [b2Timer.h <34:2 34:5>]
+SYMBOL_METHOD public float32 b2Timer::GetMilliseconds() const [b2Timer.h <37:10 37:24>]
+REFERENCE_TYPE_USAGE float32 b2Timer::GetMilliseconds() const -> float32 [b2Timer.h <37:2 37:8>]
+SYMBOL_FIELD private float64 b2Timer::m_start [b2Timer.h <42:10 42:16>]
+REFERENCE_TYPE_USAGE float64 b2Timer::m_start -> float64 [b2Timer.h <42:2 42:8>]
+SYMBOL_FIELD private static float64 b2Timer::s_invFrequency [b2Timer.h <43:17 43:30>]
+REFERENCE_TYPE_USAGE static float64 b2Timer::s_invFrequency -> float64 [b2Timer.h <43:9 43:15>]
+SYMBOL_METHOD public void b2Timer::b2Timer(const b2Timer &) [b2Timer.h <26:7 26:13>]
+SYMBOL_METHOD public void b2Timer::b2Timer(b2Timer &&) [b2Timer.h <26:7 26:13>]
 SYMBOL_FIELD private static float64 b2Timer::s_invFrequency [b2Timer.cpp <23:18 23:31>]
 SYMBOL_CLASS b2Timer
 QUALIFIER: b2Timer [b2Timer.cpp <23:9 23:15>]
@@ -33,7 +187,6 @@ REFERENCE_USAGE void b2Timer::b2Timer() -> LONGLONG _LARGE_INTEGER::QuadPart [b2
 LOCAL_SYMBOL: b2Timer.cpp<33:16> [b2Timer.cpp <46:20 46:31>]
 SYMBOL_METHOD public void b2Timer::Reset() [b2Timer.cpp <49:1 <49:15 49:19> 54:1>]
 QUALIFIER: b2Timer [b2Timer.cpp <49:6 49:12>]
-SYMBOL_BUILTIN_TYPE void
 REFERENCE_TYPE_USAGE void b2Timer::Reset() -> void [b2Timer.cpp <49:1 49:4>]
 LOCAL_SYMBOL: b2Timer.cpp<51:16> [b2Timer.cpp <51:16 51:27>]
 REFERENCE_TYPE_USAGE void b2Timer::Reset() -> LARGE_INTEGER [b2Timer.cpp <51:2 51:14>]