Merge branch 'pg/maint-apply-remove-unused-variable' into maint-1.7.11
authorJunio C Hamano <gitster@pobox.com>
Tue, 11 Sep 2012 17:53:11 +0000 (10:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Sep 2012 17:53:11 +0000 (10:53 -0700)
* pg/maint-apply-remove-unused-variable:
  apply: delete unused deflate_origlen from patch struct

1  2 
builtin/apply.c

diff --cc builtin/apply.c
Simple merge