merging for org

2018-12-28 14:31:30 -06:00
parent 27247e5ecd cfde8ada63
commit 75b7b5df0b
51 changed files with 10134 additions and 6286 deletions
@@ -192,4 +192,3 @@ namespace advsettings {
 		void audioProfileDefaultChanged(bool value);
 	};

-} // namespace advsettings