diff options
author | marha <marha@users.sourceforge.net> | 2012-06-15 08:55:18 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-06-15 08:55:18 +0200 |
commit | d6f64084b9bc07d0bdd527f9354f2d1d962ed16d (patch) | |
tree | 81b2652d421992fd63143a04885e332e83e18d07 /mesalib/docs/egl.html | |
parent | 669b562a737c9418c53bfae69c0dbf1aabe318b4 (diff) | |
parent | 7a2af605c2c2b0d2e9bbb0b161eba8842acefbcb (diff) | |
download | vcxsrv-d6f64084b9bc07d0bdd527f9354f2d1d962ed16d.tar.gz vcxsrv-d6f64084b9bc07d0bdd527f9354f2d1d962ed16d.tar.bz2 vcxsrv-d6f64084b9bc07d0bdd527f9354f2d1d962ed16d.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
fontconfig/src/fcint.h
fontconfig/src/fcstat.c
mesalib/src/mapi/glapi/gen/GL3x.xml
xorg-server/glx/glxext.h
Diffstat (limited to 'mesalib/docs/egl.html')
-rw-r--r-- | mesalib/docs/egl.html | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/mesalib/docs/egl.html b/mesalib/docs/egl.html index 5b750070c..e374357c9 100644 --- a/mesalib/docs/egl.html +++ b/mesalib/docs/egl.html @@ -1,9 +1,10 @@ -<html> - -<title>Mesa EGL</title> - -<head><link rel="stylesheet" type="text/css" href="mesa.css"></head> - +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> +<html lang="en"> +<head> + <meta http-equiv="content-type" content="text/html; charset=utf-8"> + <title>Mesa EGL</title> + <link rel="stylesheet" type="text/css" href="mesa.css"> +</head> <body> <h1>Mesa EGL</h1> |