]> git.rm.cloudns.org Git - xonotic/netradiant.git/commit
fix merge
authorThomas Debesse <dev@illwieckz.net>
Mon, 25 May 2020 15:43:13 +0000 (17:43 +0200)
committerThomas Debesse <dev@illwieckz.net>
Mon, 25 May 2020 15:43:13 +0000 (17:43 +0200)
commita764616a9c1b2f9148e3381f808b600c512592c9
tree7ff7fde700e2e4254f06ab276401749b42eae0bd
parentb8c3c38b6593cf013c8591d142854a842c79b1a2
fix merge
libs/gtkutil/cursor.cpp
libs/gtkutil/cursor.h
radiant/entityinspector.cpp
radiant/findtexturedialog.cpp