diff options
| author | marha <marha@users.sourceforge.net> | 2013-06-21 10:37:30 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-06-21 10:37:30 +0200 |
| commit | 84f6a75a56f4749f91a51a161c1989cbc8807b80 (patch) | |
| tree | e72d3e4ee697bb7f35a2dccb6f17edf3a03a6d78 /mesalib/src/glsl/main.cpp | |
| parent | 6ac57d622cdabb2db9f8dce51f0313892e6bd1aa (diff) | |
| parent | 7f9fb534564d0eb8a62cf444e569a07166e5ee03 (diff) | |
| download | vcxsrv-84f6a75a56f4749f91a51a161c1989cbc8807b80.tar.gz vcxsrv-84f6a75a56f4749f91a51a161c1989cbc8807b80.tar.bz2 vcxsrv-84f6a75a56f4749f91a51a161c1989cbc8807b80.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xserver mesa git update 21 June 2013
Conflicts:
xorg-server/hw/xwin/windialogs.c
xorg-server/hw/xwin/winmultiwindowclass.c
Diffstat (limited to 'mesalib/src/glsl/main.cpp')
0 files changed, 0 insertions, 0 deletions