Merge branch 'master' of git://ctrl.tukaani.org/xz
commitd47a955bd3e2f212420d54c8568ec3f6b48cf4ae
authorJonathan Nieder <jrnieder@gmail.com>
Tue, 13 Jul 2010 23:38:01 +0000 (13 18:38 -0500)
committerJonathan Nieder <jrnieder@gmail.com>
Tue, 13 Jul 2010 23:38:01 +0000 (13 18:38 -0500)
tree1b67672922103a180707a5751ea6c5e73e98fc6c
parentc0d227cb4441d5061b1c1881e184e0f95db7d2a1
parenta540198ffb25fad36380c5e92ac20c2d28eec46a
Merge branch 'master' of git://ctrl.tukaani.org/xz

Sync with upstream.

* 'master' of git://ctrl.tukaani.org/xz:
  Updated THANKS.
  Add two simple example programs.
  Add --no-adjust.
  Updated THANKS.
  Clarify the description of the default memlimit in the man page.
  Fix string to uint64_t conversion.
  Put the git commit to the filename in mydist rule.
debian/changelog