diff options
author | marha <marha@users.sourceforge.net> | 2014-08-30 13:45:43 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2014-08-30 13:45:43 +0200 |
commit | 3293021e6f582c7348667e7638941620134525e1 (patch) | |
tree | 5d8d3da8242ff7828fb6964bed19b13d74d48704 /mesalib/src/hgl | |
parent | 0a9ab140bb01b96888e313466a73e26e5156f22d (diff) | |
parent | e21655632e3fd40b7f6a5cc3c7f3c379d54557c4 (diff) | |
download | vcxsrv-3293021e6f582c7348667e7638941620134525e1.tar.gz vcxsrv-3293021e6f582c7348667e7638941620134525e1.tar.bz2 vcxsrv-3293021e6f582c7348667e7638941620134525e1.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/hw/kdrive/ephyr/ephyrinit.c
Diffstat (limited to 'mesalib/src/hgl')
-rw-r--r-- | mesalib/src/hgl/GLRendererRoster.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/hgl/GLRendererRoster.cpp b/mesalib/src/hgl/GLRendererRoster.cpp index 1712a871c..d29f7ecc8 100644 --- a/mesalib/src/hgl/GLRendererRoster.cpp +++ b/mesalib/src/hgl/GLRendererRoster.cpp @@ -17,7 +17,7 @@ #include <Directory.h> #include <FindDirectory.h> #include <Path.h> -#include <String.h> +#include <strings.h> #include "GLDispatcher.h" #include "GLRendererRoster.h" |