Merge branch 'nd/include-termios-for-osol' into maint
commit2e9d7330aaadd06d828da52f73eeda7106ba4cb4
authorJunio C Hamano <gitster@pobox.com>
Wed, 10 Feb 2010 21:01:55 +0000 (10 13:01 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 10 Feb 2010 21:01:55 +0000 (10 13:01 -0800)
tree3eb86a8f812e9f0fce0a877d5b46f96675ee6bda
parenta42332c21723fde9f36b579f6b39a23aa1aac137
parenteb80042c6a631aee74bd0d1b1dd845784e9788cd
Merge branch 'nd/include-termios-for-osol' into maint

* nd/include-termios-for-osol:
  Add missing #include to support TIOCGWINSZ on Solaris