Merge branch 'master' of git://ctrl.tukaani.org/xz
commit02efb3dde933b20f636b5828fe20fe59611a4cd0
authorJonathan Nieder <jrnieder@gmail.com>
Wed, 11 Aug 2010 01:26:22 +0000 (10 20:26 -0500)
committerJonathan Nieder <jrnieder@gmail.com>
Wed, 11 Aug 2010 01:26:22 +0000 (10 20:26 -0500)
tree66c42e3a85135c7ca90280c296e5c65e3d0f9f31
parent523876a4c5e0ed47f0b0b26c95573b07c409cb07
parentd5653ba8a1ea9c00de4fddc617aba3c51e18139d
Merge branch 'master' of git://ctrl.tukaani.org/xz

Sync with upstream.

* 'master' of git://ctrl.tukaani.org/xz:
  Fix test_compress.sh.
  Disable the memory usage limiter by default.
  Add missing const to a global constant in xz.
  Language fixes for man pages.
  Windows: Add a note about building a Git repository snapshot
  Windows: build.sh is a bash script so name it correctly.
  Windows: Don't strip liblzma.a too much.
debian/changelog