Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

BornAgain
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

78774d39

"README.md" did not exist on "3266dd37cbea238f8b5e790c4b5c2ab8503ce8e1"

Unverified Commit 78774d39 authored 6 years ago by Yurov, Dmitry Committed by GitHub 6 years ago

Downloads
- Plain Diff

Merge branch 'develop' into develop

parents ef3b173e b7a8d61f

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

GUI/ba3d/ba3d/shaders.qrc 0 additions, 1 deletion

GUI/ba3d/ba3d/shaders.qrc
GUI/ba3d/ba3d/shaders/fragment_shader.frag 21 additions, 5 deletions

GUI/ba3d/ba3d/shaders/fragment_shader.frag
GUI/ba3d/ba3d/shaders/fragment_shader_OSX.frag 0 additions, 12 deletions

GUI/ba3d/ba3d/shaders/fragment_shader_OSX.frag
GUI/ba3d/ba3d/view/camera.cpp 2 additions, 2 deletions

GUI/ba3d/ba3d/view/camera.cpp
GUI/ba3d/ba3d/view/program.cpp 7 additions, 5 deletions

GUI/ba3d/ba3d/view/program.cpp
GUI/ba3d/ba3d/view/program.h 1 addition, 2 deletions

GUI/ba3d/ba3d/view/program.h

with 31 additions and 27 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