diff options
| author | Arisotura <thetotalworm@gmail.com> | 2020-07-27 16:01:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-27 16:01:55 +0200 |
| commit | dff14ca80ada883870131c7ff17d85866254ccc0 (patch) | |
| tree | c15926879ed78d68d313c75e4cb7d764cb4c1fea /src/DSi.cpp | |
| parent | 17ce4d2a73770ecd8c5f0ff036636b5453cb86c9 (diff) | |
| parent | 6a682a8ef0d1cc3aa35eaa70c4f7a7d106b25b06 (diff) | |
Merge pull request #682 from nadiaholmquist/slirp-merge
Merge slirp branch into master
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. |