diff options
| author | yenatch <yenatch@gmail.com> | 2017-03-22 18:34:29 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2017-03-22 18:34:29 -0400 |
| commit | 7acbfe40778bfbd03b0e2d357efef9ee9b0a34e9 (patch) | |
| tree | 90c0b95146f3d768b536658eac6a63ff9adcaaec /src/text_window.c | |
| parent | c0a27d5455014bfe54f7ea73e8a38ce0ed8da6da (diff) | |
| parent | e3c26e52ae6ab881ade913ca1fad2cd9629bbcb1 (diff) | |
Merge remote-tracking branch 'origin/master'
Conflicts:
Makefile
Diffstat (limited to 'src/text_window.c')
| -rw-r--r-- | src/text_window.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/text_window.c b/src/text_window.c index 1ac624dd0..9a88789d1 100644 --- a/src/text_window.c +++ b/src/text_window.c @@ -1,8 +1,8 @@ #include "global.h" #include "text_window.h" #include "main.h" -#include "text.h" #include "palette.h" +#include "text.h" #define STD_MSG_BOX_LEFT 0 #define STD_MSG_BOX_TOP 14 |