summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-04-19 01:28:27 -0700
committerJunio C Hamano <gitster@pobox.com>2010-04-19 01:28:27 -0700
commit8165952517bf82b6a632cefc047ad14f36a74b25 (patch)
tree22c79015535b9407a5a83ab49b454650d780b763
parentDocumentation: Describe other situations where -z affects git diff (diff)
parentMSVC: Fix build by adding missing termios.h dummy (diff)
downloadgit-8165952517bf82b6a632cefc047ad14f36a74b25.tar.xz
git-8165952517bf82b6a632cefc047ad14f36a74b25.zip
Merge branch 'maint-1.6.6' into maint
* maint-1.6.6: MSVC: Fix build by adding missing termios.h dummy
-rw-r--r--compat/vcbuild/include/termios.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/compat/vcbuild/include/termios.h b/compat/vcbuild/include/termios.h
new file mode 100644
index 00000000000..0d8552a2c6d
--- /dev/null
+++ b/compat/vcbuild/include/termios.h
@@ -0,0 +1 @@
+/* Intentionally empty file to support building git with MSVC */