From 7dc9eb4d5641d5980a2cc0eb8f1e459b4bfdfb4a Mon Sep 17 00:00:00 2001
From: Vicki Pfau <vi@endrift.com>
Date: Tue, 11 Apr 2017 21:29:24 -0700
Subject: [PATCH] Feature: Make -l option explicit

---
 CHANGES                   | 1 +
 src/feature/commandline.c | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/CHANGES b/CHANGES
index da5eea6cc..8739f213a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -87,6 +87,7 @@ Misc:
  - Qt: Make "Mute" able to be bound to a key
  - Core: Restore sleep callback
  - Qt: Add .gb/.gbc files to the extension list in Info.plist
+ - Feature: Make -l option explicit
 
 0.5.2: (2016-12-31)
 Bugfixes:
diff --git a/src/feature/commandline.c b/src/feature/commandline.c
index ae9f72c18..9e9158208 100644
--- a/src/feature/commandline.c
+++ b/src/feature/commandline.c
@@ -38,6 +38,7 @@ static const struct option _options[] = {
 	{ "gdb",       no_argument, 0, 'g' },
 #endif
 	{ "help",      no_argument, 0, 'h' },
+	{ "log-level", required_argument, 0, 'l' },
 	{ "movie",     required_argument, 0, 'v' },
 	{ "patch",     required_argument, 0, 'p' },
 	{ "version",   no_argument, 0, '\0' },
@@ -217,6 +218,7 @@ void usage(const char* arg0, const char* extraOptions) {
 #ifdef USE_GDB_STUB
 	puts("  -g, --gdb           Start GDB session (default port 2345)");
 #endif
+	puts("  -l, --log-level N   Log level mask");
 	puts("  -v, --movie FILE    Play back a movie of recorded input");
 	puts("  -p, --patch FILE    Apply a specified patch file when running");
 	puts("  -s, --frameskip N   Skip every N frames");