Merge remote-tracking branch 'upstream/master' into locPowerRename

This commit is contained in:
Alekhya Kommuru
2020-01-16 13:58:59 -08:00
23 changed files with 210 additions and 254 deletions

View File

@@ -6,6 +6,7 @@
#include <trace.h>
#include <common.h>
#include <Helpers.h>
#include <icon_helpers.h>
#include <Settings.h>
#include "resource.h"