diff options
| author | Mikael Magnusson <mikma@users.sourceforge.net> | 2023-05-27 21:55:12 +0200 |
|---|---|---|
| committer | Mikael Magnusson <mikma@users.sourceforge.net> | 2023-05-27 21:55:12 +0200 |
| commit | f74e422d90bb41be5f0cca71254620b1b122b2b5 (patch) | |
| tree | 1c9139408c3e902d7ad944e7bd9bc28d19d19412 /.idea/codeStyles/codeStyleConfig.xml | |
| parent | ba8ba920466787d8bd94b7b078be41b09441543c (diff) | |
| parent | fee2d9dec12dd9e5a8a8b25537ec1b389bfeb1e5 (diff) | |
| parent | c559755ff6a434ca76571f5577f123ba4aadf52b (diff) | |
Merge branches 'm7n' and 'version' into build17build17