[Scummvm-git-logs] scummvm master -> cf9690f6b6835b3a9c42013f1b941e85f99129da

[digitall]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
cf9690f6b6 GUI: Fix duplicate include guard


Commit: cf9690f6b6835b3a9c42013f1b941e85f99129da
    https://github.com/scummvm/scummvm/commit/cf9690f6b6835b3a9c42013f1b941e85f99129da
Author: Michał Janiszewski (janisozaur at users.noreply.github.com)
Date: 2018-10-31T18:53:28Z

Commit Message:
GUI: Fix duplicate include guard

The guard clashed with engines/dialogs.h

Changed paths:
    gui/predictivedialog.h


diff --git a/gui/predictivedialog.h b/gui/predictivedialog.h
index 1f6bdf8..a8be434 100644
--- a/gui/predictivedialog.h
+++ b/gui/predictivedialog.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef GLOBAL_DIALOGS_H
-#define GLOBAL_DIALOGS_H
+#ifndef GUI_PREDICTIVEDIALOG_H
+#define GUI_PREDICTIVEDIALOG_H
 
 #include "gui/dialog.h"
 #include "common/str.h"