Merge branch 'master' of git://ctrl.tukaani.org/xz
commit84e21de0a88e1989bc65a292f2be1bdeb034af19
authorJonathan Nieder <jrnieder@gmail.com>
Tue, 16 Feb 2010 05:14:10 +0000 (15 23:14 -0600)
committerJonathan Nieder <jrnieder@gmail.com>
Tue, 16 Feb 2010 05:14:10 +0000 (15 23:14 -0600)
treeb5390cab3c427a65bee26ffe26f1bc0fa223bc82
parent4a1fc66fa805c9d641c84dfaa7de611d20f773e6
parenteb7d51a3faf9298c0c7aa9aaeae1023dcf9e37ea
Merge branch 'master' of git://ctrl.tukaani.org/xz

Sync with upstream.

* 'master' of git://ctrl.tukaani.org/xz:
  Collection of language fixes to comments and docs.
  Fix jl -> jb in ASM files.
  Use __APPLE__ instead of __MACH__ in ASM files.
debian/changelog