Merge branch 'xcode-6-librarian-flags' into release
Merge branch 'FindQt4-more-plugins' into release
ExternalProject: Recognize .tbz2 extension

Also fix .bz2 extension to be .tar.bz2 since we only support compressed
tarballs and not plain compressed files.

Suggested-by: Nils Gladitz <nilsgladitz@gmail.com>
Suggested-by: Rolf Eike Beer <eike@sf-mail.de>
ExternalProject: Recognize lzma-compressed files (#13515)

Add .7z, .tar.xz, and .txz file extensions.

Inspired-by: Joke de Buhr <joke@seiken.de>
Inspired-by: David Cole <DLRdave@aol.com>
CPack: add generators for .7z and .tar.xz (#13072, #14519)
VS: Convert 'WriteSource' tool argument to std::string
VS: Refactor handling of "extra" sources in VS >= 10

Create a WriteExtraSource method to handle writing of sources not
classified by cmGeneratorTarget for any particular purpose.  This
will be useful to add special VS-specific handling for some sources.
VS: Refactor handling of "header" sources in VS >= 10

Create a WriteHeaderSource method to handle writing of sources
classified by cmGeneratorTarget as header files.  This will be
useful to add special VS-specific handling for some headers.
VS: Refactor handling of resx headers

Move generation of the ClInclude element to WriteHeaderSource.
VS: Map .appxmanifest sources to AppxManifest tool

Inspired-by: Minmin Gong <minmin.gong@gmail.com>
VS: Map .xml to XML tool

Inspired-by: Gilles Khouzam <gillesk@microsoft.com>
VS: Map .jpg and .png sources to Image tool

Inspired-by: Gilles Khouzam <gillesk@microsoft.com>
Ninja: Remove _COMPILER_LINKER_OPTION_FLAG_ remnants
Merge topic 'cpack-add-lzma'

f931a18c CPack: add generators for .7z and .tar.xz (#13072, #14519)
Merge topic 'ExternalProject-add-lzma'

56e6975c ExternalProject: Recognize lzma-compressed files (#13515)
98ea0344 ExternalProject: Recognize .tbz2 extension
Merge topic 'vs-refactor-source-tools'

0ac28adc VS: Map .jpg and .png sources to Image tool
58bb14d4 VS: Map .xml to XML tool
972cf1d7 VS: Map .appxmanifest sources to AppxManifest tool
15fb1022 VS: Refactor handling of resx headers
c2ef6d23 VS: Refactor handling of "header" sources in VS >= 10
2df38911 VS: Refactor handling of "extra" sources in VS >= 10
143b4005 VS: Convert 'WriteSource' tool argument to std::string
Merge topic 'remove-link-remnants'

250ad08a Ninja: Remove _COMPILER_LINKER_OPTION_FLAG_ remnants
Merge branch 'release'