Commit Graph

5 Commits

Author SHA1 Message Date
349ba83ec3 upd 2024-02-07 15:36:10 +01:00
c20788feaa Merge branch 'merge_with_textures' of https://git.wmi.amu.edu.pl/s473559/Grafika2023 into merge_with_textures
# Conflicts:
#	PlanetCreator/cw 6/shaders/shader_5_1_tex.frag
2024-02-07 15:33:56 +01:00
bb40477d86 upd shader_tex 2 2024-02-07 15:31:46 +01:00
e571743eb1 upd shader_tex 2024-02-07 15:22:05 +01:00
03ab368c52 fresh start 2024-01-11 17:57:31 +01:00