Merge pull request cyberbotics#6530 from cyberbotics/sync-master-4553b962a

Merge master into develop

Author: omichel

scripts/install/bash_profile.windows

@@ -18,14 +18,6 @@ export WEBOTS_DISABLE_SAVE_SCREEN_PERSPECTIVE_ON_CLOSE=1  # If defined, Webots w
 export WEBOTS_ALLOW_MODIFY_INSTALLATION=1                 # If defined, you are allowed to modify files in the Webots home using Webots.
 
 
-############################################################################
-# These aliases are useful in combination with the Atom source code editor #
-############################################################################
-
-alias atom="PATH=/mingw64/bin:/usr/bin:/C/WINDOWS/system32 /C/Users/$USER/AppData/Local/atom/bin/atom.cmd"
-alias reset_atom="edit --clear-window-state"
-
-
 ####################################################################################################
 # These aliases / environment variables allow to easily switch between a two webots source folders #
 ####################################################################################################

scripts/install/msys64_installer.sh

@@ -32,10 +32,7 @@ declare -a OPTIONAL_PACKAGES=(
   "git"                         # Distribution script (check_submodules_update.sh)
   "pacman-contrib"              # Distribution script (pactree)
   "swig"                        # Python and Java API wrappers
-  "mingw-w64-x86_64-libssh"     # Robotis OP2 robot window
-  "mingw-w64-x86_64-libzip"     # Robotis OP2 robot window
   "mingw-w64-x86_64-boost"      # to recompile ROS controller
-  "mingw-w64-x86_64-cmake"      # Thymio II dashel library
   "mingw-w64-x86_64-python-pip" # Useful for advanced python usage
 )