Merge branch 'pg/maint-apply-remove-unused-variable' into maint-1.7.11
commit10a32fa95466f0c16531fe9b3d3f9a190f90f5f2
authorJunio C Hamano <gitster@pobox.com>
Tue, 11 Sep 2012 17:53:11 +0000 (11 10:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Sep 2012 17:53:11 +0000 (11 10:53 -0700)
tree118ffaeb59c958b3615d2c2fb2a856c798984663
parent9a8eea9604ade731c3d0ff10136f2ae81b2a13c8
parentee922391864026097a196f97ecb14548ab2bf211
Merge branch 'pg/maint-apply-remove-unused-variable' into maint-1.7.11

* pg/maint-apply-remove-unused-variable:
  apply: delete unused deflate_origlen from patch struct
builtin/apply.c