Merge branch 'master' into gl2.1 (3665eaf7) · Commits · nproject / pixel · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

pixel
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

3665eaf7

Commit 3665eaf7 authored 7 years ago by faiface

Downloads
- Plain Diff

Merge branch 'master' into gl2.1

parents fa2c741f c0766504

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

README.md 1 addition, 0 deletions

README.md
data.go 1 addition, 1 deletion

data.go
geometry.go 40 additions, 33 deletions

geometry.go
imdraw/imdraw.go 42 additions, 9 deletions

imdraw/imdraw.go
pixelgl/canvas.go 12 additions, 2 deletions

pixelgl/canvas.go
pixelgl/gltriangles.go 11 additions, 9 deletions

pixelgl/gltriangles.go

with 107 additions and 54 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment