Merge branch 'maint'
commitf526d120f649ec4426b559e94e09655b5a4f2b87
authorJunio C Hamano <gitster@pobox.com>
Fri, 25 Jun 2010 18:45:27 +0000 (25 11:45 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 25 Jun 2010 18:45:27 +0000 (25 11:45 -0700)
treed1be8cbf55a8f0913b4347bece6ea5ecbcb580b0
parentba4d01bd74edae1e4adb540a03ba17961f8dd4b2
parent9eafa1201b2dcc703258ca7cd53de8ac4de74565
Merge branch 'maint'

* maint:
  msvc: Fix some compiler warnings
  Documentation: grep: fix asciidoc problem with --
  msvc: Fix some "expr evaluates to function" compiler warnings
builtin.h
builtin/notes.c
notes.h