Merge branch 'master' of git://ctrl.tukaani.org/xz into jn/translation
commit180761958ac89a595e61144fc05cc419473a012b
authorJonathan Nieder <jrnieder@gmail.com>
Fri, 4 Jun 2010 08:17:29 +0000 (4 03:17 -0500)
committerJonathan Nieder <jrnieder@gmail.com>
Fri, 4 Jun 2010 08:17:29 +0000 (4 03:17 -0500)
tree1bde7d4eec17671dc7a99abaf8b3daa61df3c5ef
parentf0d79fc57e4e63bfcf5f2e906a81b8b2f25cf9e5
parentd8b41eedce486d400f701b757b7b5e4e32276618
Merge branch 'master' of git://ctrl.tukaani.org/xz into jn/translation

* 'master' of git://ctrl.tukaani.org/xz:
  Fix compiling with -Werror.
  Silence a bogus Valgrind warning.
  Fix a Windows-specific FIXME in signal handling code.
  Adjust SA_RESTART workaround.
  xz man page updates.
  Major update to xz --list.
  Rename message_filters_get() to message_filters_to_str().
  Fix a comment.
  Fix lzma_block_compressed_size().
  Take Cygwin into account in some #if lines.