Merge branch 'master' of git://ctrl.tukaani.org/xz
commit61c9bd313b25b22095bcb1168bea6e7264ca56bb
authorJonathan Nieder <jrnieder@gmail.com>
Mon, 8 Feb 2010 23:58:55 +0000 (8 17:58 -0600)
committerJonathan Nieder <jrnieder@gmail.com>
Mon, 8 Feb 2010 23:58:55 +0000 (8 17:58 -0600)
tree0ef41ea4c4ea74c666711118865ecbc7c692cd21
parentd28bc8b08eab82b2b7632c9bbe6e93cc10840921
parent6503fde658a5cdbdd907a788865470dd64771601
Merge branch 'master' of git://ctrl.tukaani.org/xz

Sync with upstream.  Add a debian/liblzma-dev.NEWS file to keep
track of future API changes, instead of letting them dominate
debian/changelog.

* 'master' of git://ctrl.tukaani.org/xz:
  Subtle change to liblzma Block handling API.
debian/changelog
debian/liblzma-dev.NEWS