git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b5699d1 49d6cfa)
Merge branch 'hv/config-from-blob' into maint
authorJunio C Hamano <redacted>
Thu, 5 Sep 2013 21:40:18 +0000 (14:40 -0700)
committerJunio C Hamano <redacted>
Thu, 5 Sep 2013 21:40:18 +0000 (14:40 -0700)
commitbda790474690a5e5e9963221dc0d5b66fbf01875
tree560ab7d7faaf24304dc0f64ec75f3c3d74c32d2ftree | snapshot
parentb5699d17c3e04a022227fd95106e89f281417dcdcommit | diff
parent49d6cfa5c2874d78360dc4b16558bb45b5f8e003commit | diff
Merge branch 'hv/config-from-blob' into maint

Compilation fix on platforms with fgetc() and friends defined as
macros.

* hv/config-from-blob:
  config: do not use C function names as struct members
config.c diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT