Skip to content

Commit

Permalink
Merge branch 'develop' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
ctapmex committed Dec 20, 2020
2 parents 3d7b8fe + 14c747b commit d995cd6
Show file tree
Hide file tree
Showing 12 changed files with 2,204 additions and 2,453 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ endif ()
message("Build type for UnInstall: ${CMAKE_BUILD_TYPE}")

# check platform for build
set(IS_x64_PLATFORM FALSE)
set(IS_x64_PLATFORM FALSE CACHE BOOL "" FORCE)
if ("$ENV{PLATFORM}" MATCHES "x64")
set(IS_x64_PLATFORM TRUE)
set(IS_x64_PLATFORM TRUE CACHE BOOL "" FORCE)
endif ()

# Get plugin version from src/version.hpp and put it in PLUGIN_VERSION
Expand Down
7 changes: 6 additions & 1 deletion WhatsNew.Rus.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
v1.10.18
v1.10.19
- добавлена поддержка Windows 2000 и WindowsXP
- в списке установленных программ работает фильтрация по символам ,.+-
- исправлена ошибка поиска установленных программ, есди длина команды удаления более 256 символов

v1.10.18
- адаптация под актуальный Far3

v1.10.17
Expand Down
Loading

0 comments on commit d995cd6

Please sign in to comment.