diff options
| author | Arisotura <thetotalworm@gmail.com> | 2020-10-26 20:47:30 +0100 |
|---|---|---|
| committer | Arisotura <thetotalworm@gmail.com> | 2020-10-26 20:47:30 +0100 |
| commit | fc922ffb14da3aa087a7eebeb55d09cf3b856e0d (patch) | |
| tree | 68ad639693d7b97d286e71364ac796bfaaeefd7b /src/frontend/qt_sdl/WifiSettingsDialog.ui | |
| parent | 8d42b1c7d7466abf80a61ea51ee3006110c15b65 (diff) | |
| parent | 49a96f41daa53ffa5dc4a46bdac4ee68f0b7eaee (diff) | |
Merge branch 'master' into dsi_camera
# Conflicts:
# src/DSi_I2C.cpp
Diffstat (limited to 'src/frontend/qt_sdl/WifiSettingsDialog.ui')
0 files changed, 0 insertions, 0 deletions