Commit c277395a authored by Martin Schultz's avatar Martin Schultz
Browse files

Merge branch 'fixWindowsBrandingNameClash' into 'unstable'

also group OpenFlipper project so the productstring can be the same as the

See merge request !306
parents 234debee 62f9206f
......@@ -414,6 +414,7 @@ set (PREFOUND_PACKAGES "${LOADED_PACKAGES}" CACHE INTERNAL "List of packages tha
# ========================================================================
add_subdirectory (OpenFlipper/CoreApp)
# ========================================================================
OpenFlipper @ 24d62d9c
Subproject commit b31da1d8b6a6af9654f25f624c1daa1803d97e60
Subproject commit 24d62d9cec46e1e02439ce631561ab864db27e0a
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment