aillieo da8c0e2f79 resolve conflicts

2017-08-16 22:16:45 +08:00

..

01 Depth testing.md

Update 04-02

2017-06-30 00:30:50 +08:00

02 Stencil testing.md

Update 04-02

2017-06-30 00:30:50 +08:00

03 Blending.md

Update 04-03

2017-07-02 19:17:28 +08:00

04 Face culling.md

Rewrite 04-04

2017-07-04 13:39:26 +08:00

05 Framebuffers.md

fix error

2017-08-16 21:59:00 +08:00

06 Cubemaps.md

Rewrite 04-06

2017-07-15 22:27:06 +08:00

07 Advanced Data.md

resolve conflicts

2017-08-16 22:16:45 +08:00

08 Advanced GLSL.md

resolve conflicts

2017-08-16 22:16:45 +08:00

09 Geometry Shader.md

fix some translation errors and code displaying errors.

2017-04-05 20:30:27 +08:00

10 Instancing.md

Move all the images to this repo. Close #53

2016-09-17 02:11:48 +08:00

11 Anti Aliasing.md

fiex some nouns translation

2017-04-09 15:41:19 +08:00