From fc37cc4a02ed13d1a73b941a9f80975600fd1b99 Mon Sep 17 00:00:00 2001 From: David Foerster Date: Tue, 10 May 2016 20:20:14 +0200 Subject: Normalize all line terminators --- src/Build/Tools/MacOSX/nasm | Bin 1818752 -> 1818750 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'src/Build') diff --git a/src/Build/Tools/MacOSX/nasm b/src/Build/Tools/MacOSX/nasm index 7d2c38ac..62a6702a 100755 Binary files a/src/Build/Tools/MacOSX/nasm and b/src/Build/Tools/MacOSX/nasm differ -- cgit v1.2.3 From 191075155835172e5596e191cf0679ff9022f0fd Mon Sep 17 00:00:00 2001 From: David Foerster Date: Tue, 10 May 2016 21:58:40 +0200 Subject: Fix issues with .gitattributes - Revert accidentally converted binary file --- src/Build/Tools/MacOSX/nasm | Bin 1818750 -> 1818752 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'src/Build') diff --git a/src/Build/Tools/MacOSX/nasm b/src/Build/Tools/MacOSX/nasm index 62a6702a..7d2c38ac 100755 Binary files a/src/Build/Tools/MacOSX/nasm and b/src/Build/Tools/MacOSX/nasm differ -- cgit v1.2.3 From 11716ed2dacbb104f8f59867fe66f2c0a6984291 Mon Sep 17 00:00:00 2001 From: David Foerster Date: Tue, 10 May 2016 22:16:32 +0200 Subject: Remove trailing whitespace --- src/Build/Include/Makefile.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/Build') diff --git a/src/Build/Include/Makefile.inc b/src/Build/Include/Makefile.inc index 95d8ba60..35d1f29c 100644 --- a/src/Build/Include/Makefile.inc +++ b/src/Build/Include/Makefile.inc @@ -3,7 +3,7 @@ # Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed # by the TrueCrypt License 3.0. # -# Modifications and additions to the original source code (contained in this file) +# Modifications and additions to the original source code (contained in this file) # and all other portions of this file are Copyright (c) 2013-2016 IDRIX # and are governed by the Apache License 2.0 the full text of which is # contained in the file License.txt included in VeraCrypt binary and source @@ -53,7 +53,7 @@ TR_SED_BIN := tr '\n' ' ' | tr -s ' ' ',' | sed -e 's/^,//g' -e 's/,$$/n/' | tr %.txt.h: %.txt @echo Converting $($@ - + %.bmp.h: %.bmp @echo Converting $($@ -- cgit v1.2.3