VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Resources
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2022-01-16 15:43:45 +0100
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2022-01-16 15:43:45 +0100
commitfcb220e39ad0cb051f097a674898683c4531e5c9 (patch)
treec04b655dd450f2b1f3612daf34ccf0bef43503cb /src/Resources
parent0d92195c91ec07f2a72d4e4c952bfff672983fa3 (diff)
parent36f71280faf32cdea46b270ae40d71cb46032039 (diff)
downloadVeraCrypt-fcb220e39ad0cb051f097a674898683c4531e5c9.tar.gz
VeraCrypt-fcb220e39ad0cb051f097a674898683c4531e5c9.zip
Merge branch 'master' of https://github.com/e2Security/VeraCrypt into e2Security-master
Changes made to src/Common/Dlgcode.c and src/Common/Language.xml to resolve conflicts. For Language.xml, new entries were put at the end and remove entries were put back in order to keep same order to entries as before. This important for compatibility with Transifex translation platform.
Diffstat (limited to 'src/Resources')
0 files changed, 0 insertions, 0 deletions