cmake/Config.cmake | 6 6 + 0 - 0 !
include/SFML/Config.hpp | 6 6 + 0 - 0 !
src/SFML/Window/CMakeLists.txt | 12 10 + 2 - 0 !
src/SFML/Window/Dummy/JoystickImpl.cpp | 49 49 + 0 - 0 !
src/SFML/Window/Dummy/JoystickImpl.hpp | 28 28 + 0 - 0 !
src/SFML/Window/JoystickImpl.hpp | 4 4 + 0 - 0 !
6 files changed, 103 insertions(+), 2 deletions(-)

 add gnu/hurd support
 This patch adds GNU/Hurd support to SFML by pretending to be linux.
 The only thing which is not supported are joysticks - a dummy
 implementation has been added.

doc/header.html.in | 1 0 + 1 - 0 !
1 file changed, 1 deletion(-)

 remove commented out googleapi css in documentation
 There isn't actually any privacy breach here (since the line is commented
 out), but removing it shuts up lintian.

doc/CMakeLists.txt | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 adjust build script to build documentation only once
 This patch removes the ALL option from the documentation build command so
 that it must be run manually with "make doc". This prevents the documentation
 being built twice (normal build + install phase). It also allows the
 documentation building to happen after the code building, which makes the
 logs much more readable in parallel builds.

CMakeLists.txt | 3 0 + 3 - 0 !
1 file changed, 3 deletions(-)

 install freebsd pkgconfig files in lib/pkgconfig again

src/SFML/Window/Unix/WindowImplX11.cpp | 30 16 + 14 - 0 !
1 file changed, 16 insertions(+), 14 deletions(-)

 [patch] fixed xlib crashing in sf::window:seticon because it expects
 the element data type passed to XChangeProperty to be unsigned long
 (architecture dependent 32-bit or 64-bit) instead of sf::Uint32 (architecture
 independent 32-bit) (#1168). Also adjusted other occurrences of wrong types
 passed to XChangeProperty with format set to 32.

[jcowgill: this is upstream PR https://github.com/SFML/SFML/pull/1171]

src/SFML/Window/GlContext.cpp | 206 145 + 61 - 0 !
src/SFML/Window/GlContext.hpp | 25 11 + 14 - 0 !
src/SFML/Window/GlResource.cpp | 48 5 + 43 - 0 !
3 files changed, 161 insertions(+), 118 deletions(-)

 [patch] replaced transientcontextlock implementation with a more
 elaborate one which relies on locking a single mutex and thus avoids lock
 order inversion. Fixes #1165.