diff options
author | Nadia Holmquist Pedersen <nadia@nhp.sh> | 2020-07-26 21:41:09 +0200 |
---|---|---|
committer | Nadia Holmquist Pedersen <nadia@nhp.sh> | 2020-07-26 21:41:09 +0200 |
commit | b4ad35948d864cbbb8e1759fbbc913870293160e (patch) | |
tree | d5c0ff7f5e4e4388f99650866af063a594aebdab /src/DSi_Camera.cpp | |
parent | 0e7df468c761579e9378183ad7f1e8ba3b405ac0 (diff) | |
parent | d9e1bf737c23f688871b2f422bc710777dffbd94 (diff) |
Merge remote-tracking branch 'upstream/slirp' into slirp-merge
Diffstat (limited to 'src/DSi_Camera.cpp')
-rw-r--r-- | src/DSi_Camera.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/DSi_Camera.cpp b/src/DSi_Camera.cpp index 45061b2..cc44052 100644 --- a/src/DSi_Camera.cpp +++ b/src/DSi_Camera.cpp @@ -1,5 +1,5 @@ /* - Copyright 2016-2019 Arisotura + Copyright 2016-2020 Arisotura This file is part of melonDS. |