search

TTimo / GtkRadiant

The open source, cross platform level editor for idtech games
http://icculus.org/gtkradiant/
Other
582 stars 152 forks source link

tools: reduce diff noise with NetRadiant #591

Closed illwieckz closed 6 years ago

illwieckz commented 6 years ago

This a PR to reduce diff noise between GtkRadiant and NetRadiant in the tools tree.

There is full of slightly minor change like whitespaces or newlines or headers or sometime just another way to do things because two people fixed the same issue at the same time on both side and they just not written the same line in the same order. All of this makes cherry-picking across forks annoying because it raises stupid merge conflict about things that are not meaningful.

Hence this Merge Request.

I also imported five fixes from NetRadiant side.

illwieckz commented 6 years ago

See netradiant!82 for a similar merge request on NetRadiant side.

tkoeppe commented 6 years ago

Hm, these changes appear to have introduced some bugs and some noise. I left individual comments.