Skip to content
Commit 9a2158bf authored by 73budden's avatar 73budden
Browse files

Merge branch 'промежуточная-ветка-2014-07-04' into Модернизация-TFXRef 

# Conflicts:
#	source/HotKeys.XML
#	source/WMNavigate.Mod (конфликта не увидел я)
parents 58eedd11 cc3c6f12
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment