DarkRadiant: master f657e3dd
Author | Committer | Branch | Timestamp | Parent |
---|---|---|---|---|
orbweaver | orbweaver | master | 26.11.2020 20:52 | master fb90b8ec |
Changeset | History-only merge of GameConnection commits Assume that all necessary merges of GameConnection refactoring have been done in Greebo's branch; this is a --strategy=ours merge to update the history accordingly and avoid duplicate merges of refactoring commits which introduce massive conflicts. |