diff options
| author | Ixtli <cg@325i.org> | 2010-04-01 20:27:29 +0900 |
|---|---|---|
| committer | Enne Walker <ennewalker@users.sourceforge.net> | 2010-04-24 10:19:48 -0400 |
| commit | 9d87b908ebb3cc0a7837873ed35ba47ff65ff141 (patch) | |
| tree | 0d4490ed0f37413061e3a6905265bdf2565f6dc2 /crawl-ref/source/tilereg.cc | |
| parent | 2c7e60f2c53ee92b1fd323330b207945221db10b (diff) | |
| download | crawl-ref-9d87b908ebb3cc0a7837873ed35ba47ff65ff141.tar.gz crawl-ref-9d87b908ebb3cc0a7837873ed35ba47ff65ff141.zip | |
Fixups for things that broke during rebase.
Diffstat (limited to 'crawl-ref/source/tilereg.cc')
| -rw-r--r-- | crawl-ref/source/tilereg.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/crawl-ref/source/tilereg.cc b/crawl-ref/source/tilereg.cc index 3dcb9bece6..356abdda71 100644 --- a/crawl-ref/source/tilereg.cc +++ b/crawl-ref/source/tilereg.cc @@ -4697,7 +4697,6 @@ void CRTRegion::detach_menu() m_attached_menu = NULL; } -<<<<<<< HEAD MenuRegion::MenuRegion(ImageManager *im, FontWrapper *entry) : m_image(im), m_font_entry(entry), m_mouse_idx(-1), m_max_columns(1), m_dirty(false), m_font_buf(entry) |