diff options
| author | marha <marha@users.sourceforge.net> | 2011-06-08 08:28:34 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-06-08 08:28:34 +0200 |
| commit | 414e95994496b7026621c7e4f6d01b364b5252b7 (patch) | |
| tree | 23c211fb0873aaf6eb1be02a37c467f02e3bd40b /mesalib/src/mesa/main/version.c | |
| parent | 4dc4001b1b78cc236548d9a01365ee4c04ee22a3 (diff) | |
| parent | adeb8256da9b636648178f729d7b3316a0a8e990 (diff) | |
| download | vcxsrv-414e95994496b7026621c7e4f6d01b364b5252b7.tar.gz vcxsrv-414e95994496b7026621c7e4f6d01b364b5252b7.tar.bz2 vcxsrv-414e95994496b7026621c7e4f6d01b364b5252b7.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
libX11/specs/libX11/AppC.xml
libX11/specs/libX11/AppD.xml
libX11/specs/libX11/CH02.xml
libX11/specs/libX11/CH03.xml
libX11/specs/libX11/CH04.xml
libX11/specs/libX11/CH05.xml
libX11/specs/libX11/CH06.xml
libX11/specs/libX11/CH07.xml
libX11/specs/libX11/CH08.xml
libX11/specs/libX11/CH09.xml
libX11/specs/libX11/CH11.xml
libX11/specs/libX11/CH13.xml
libX11/specs/libX11/CH14.xml
libX11/specs/libX11/CH15.xml
libX11/specs/libX11/CH16.xml
mesalib/src/mesa/main/fbobject.c
xorg-server/Xi/exevents.c
xorg-server/dix/events.c
xorg-server/dix/getevents.c
xorg-server/test/input.c
xorg-server/xkb/xkbfmisc.c
Diffstat (limited to 'mesalib/src/mesa/main/version.c')
0 files changed, 0 insertions, 0 deletions