]> git.rm.cloudns.org Git - xonotic/netradiant.git/commit
fix merge
authorThomas Debesse <dev@illwieckz.net>
Mon, 25 May 2020 23:37:54 +0000 (01:37 +0200)
committerThomas Debesse <dev@illwieckz.net>
Mon, 25 May 2020 23:37:54 +0000 (01:37 +0200)
commitf472e6f0e8066e62cf3e159287bb07de97d2e59d
tree75c0b11fd1bae60db758083ccf29f9cc087de273
parentd5e20f7336c5edf06fbc0c05cf30b8ad728128e7
fix merge
libs/gtkutil/xorrectangle.cpp
radiant/camwindow.cpp
radiant/entity.cpp
radiant/filterbar.cpp
radiant/mainframe.cpp
radiant/map.cpp
radiant/select.cpp
radiant/selection.cpp
radiant/xywindow.cpp