aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/Android.gen.mk
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-12-14 14:08:20 +0100
committermarha <marha@users.sourceforge.net>2011-12-14 14:08:20 +0100
commit7c06219c5953076ef3236b6a8959b99329c77ee9 (patch)
treec4b00bb9d592afcdffdb3e98c7c7320e29488adb /mesalib/src/mesa/Android.gen.mk
parent2b5652fc7742c5ac57aca701214b046626a729e9 (diff)
parent53d28537755790ee4625dc16f560cad5aa93f56b (diff)
downloadvcxsrv-7c06219c5953076ef3236b6a8959b99329c77ee9.tar.gz
vcxsrv-7c06219c5953076ef3236b6a8959b99329c77ee9.tar.bz2
vcxsrv-7c06219c5953076ef3236b6a8959b99329c77ee9.zip
Merge remote-tracking branch 'origin/released'
Conflicts: mesalib/src/mapi/glapi/gen/EXT_gpu_shader4.xml mesalib/src/mapi/glapi/gen/glX_proto_recv.py mesalib/src/mapi/glapi/gen/glX_proto_size.py mesalib/src/mapi/glapi/gen/gl_gentable.py mesalib/src/mapi/glapi/gen/gl_table.py
Diffstat (limited to 'mesalib/src/mesa/Android.gen.mk')
0 files changed, 0 insertions, 0 deletions