diff options
author | Nadia Holmquist Pedersen <nadia@nhp.sh> | 2020-07-27 16:06:53 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-27 16:06:53 +0200 |
commit | 40a9f41be8ec484728862eb065b9b6985909db33 (patch) | |
tree | a037a722e60dc06a8de6990ce9da0c50f2d7015f /src/DSi.cpp | |
parent | 5c08207f359479fdd16fa8517f9d2a5e8fe52c63 (diff) | |
parent | dff14ca80ada883870131c7ff17d85866254ccc0 (diff) |
Merge branch 'master' into fix/aarch64-ci
Diffstat (limited to 'src/DSi.cpp')
-rw-r--r-- | src/DSi.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/DSi.cpp b/src/DSi.cpp index 839fdbf..56f5356 100644 --- a/src/DSi.cpp +++ b/src/DSi.cpp @@ -1,5 +1,5 @@ /* - Copyright 2016-2019 Arisotura + Copyright 2016-2020 Arisotura This file is part of melonDS. |