]> de.git.xonotic.org Git - xonotic/netradiant.git/commit - plugins/entity/colour.h
Merge commit '6f51c7f28dc9f56ae64e7da7d42dcbaa068da65a' into garux-merge
authorThomas Debesse <dev@illwieckz.net>
Tue, 12 Feb 2019 01:56:08 +0000 (02:56 +0100)
committerThomas Debesse <dev@illwieckz.net>
Tue, 12 Feb 2019 01:56:08 +0000 (02:56 +0100)
commitc3765eb6e7f6879e5a34c48f71e5ee7bc8b8851f
treed9658cb25ab3bfeae1bb341072f1472c25a54dda
parentb243946c9ffd022cd5d82f2cf474ebfb125929b9
parent6f51c7f28dc9f56ae64e7da7d42dcbaa068da65a
Merge commit '6f51c7f28dc9f56ae64e7da7d42dcbaa068da65a' into garux-merge
15 files changed:
Makefile
contrib/camera/camera.cpp
libs/gtkutil/dialog.cpp
libs/gtkutil/image.cpp
plugins/shaders/plugin.cpp
radiant/CMakeLists.txt
radiant/entity.cpp
radiant/environment.cpp
radiant/environment.h
radiant/filterbar.cpp
radiant/filterbar.h
radiant/main.cpp
radiant/mainframe.cpp
radiant/plugintoolbar.cpp
radiant/plugintoolbar.h