after making a mess of a PR from davidzuhn and not having the git skills to fix it, I've resorted to simply copying the desired files from his PR.

I've excluded his reformatted NmraDcc.h NmraDcc.cpp because there were too many merge conflicts now, so I'll reapply his formatting rules in another commit
2021-05-09 16:51:08 +12:00
parent 1e81b95044
commit ad5ce96253
4 changed files with 88 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 .development
 *.zip
+*.orig
+*~