diff options
| author | Reid <reidyaro@gmail.com> | 2011-08-24 22:42:17 +0200 |
|---|---|---|
| committer | Reid <reidyaro@gmail.com> | 2011-08-24 22:42:17 +0200 |
| commit | 43c19a8321bd0c4bcf36655d74e895397aff7eea (patch) | |
| tree | c8f7933367ae1e757a3166a04772274896d58c9c /src/Makefile.am | |
| parent | c1ec2b921389cb5c44d9ae572ea4851891cf8bc9 (diff) | |
| parent | 9505e3789cc9db6a10a68b9794a586604271b76f (diff) | |
| download | plus-43c19a8321bd0c4bcf36655d74e895397aff7eea.tar.gz plus-43c19a8321bd0c4bcf36655d74e895397aff7eea.tar.bz2 plus-43c19a8321bd0c4bcf36655d74e895397aff7eea.tar.xz plus-43c19a8321bd0c4bcf36655d74e895397aff7eea.zip | |
Merge branch 'master' of gitorious.org:manaplus/manaplus
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 18ae560b8..57bb4e620 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -184,6 +184,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ gui/widgets/resizegrip.h \ gui/widgets/scrollarea.cpp \ gui/widgets/scrollarea.h \ + gui/widgets/setupitem.cpp \ + gui/widgets/setupitem.h \ gui/widgets/setuptab.cpp \ gui/widgets/setuptab.h \ gui/widgets/setuptabscroll.cpp \ @@ -200,8 +202,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ gui/widgets/tab.h \ gui/widgets/tabbedarea.cpp \ gui/widgets/tabbedarea.h \ - gui/widgets/table.cpp \ - gui/widgets/table.h \ + gui/widgets/guitable.cpp \ + gui/widgets/guitable.h \ gui/widgets/tablemodel.cpp \ gui/widgets/tablemodel.h \ gui/widgets/textbox.cpp \ @@ -270,8 +272,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ gui/logindialog.h \ gui/minimap.cpp \ gui/minimap.h \ - gui/ministatus.cpp \ - gui/ministatus.h \ + gui/ministatuswindow.cpp \ + gui/ministatuswindow.h \ gui/npcdialog.cpp \ gui/npcdialog.h \ gui/npcpostdialog.cpp \ @@ -302,8 +304,6 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ gui/serverdialog.h \ gui/setup.cpp \ gui/setup.h \ - gui/setupitem.cpp \ - gui/setupitem.h \ gui/setup_audio.cpp \ gui/setup_audio.h \ gui/setup_colors.cpp \ @@ -318,8 +318,12 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ gui/setup_chat.h \ gui/setup_keyboard.cpp \ gui/setup_keyboard.h \ + gui/setup_perfomance.cpp \ + gui/setup_perfomance.h \ gui/setup_players.cpp \ gui/setup_players.h \ + gui/setup_relations.cpp \ + gui/setup_relations.h \ gui/setup_video.cpp \ gui/setup_video.h \ gui/sdlfont.cpp \ @@ -348,8 +352,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ gui/tradewindow.h \ gui/unregisterdialog.cpp \ gui/unregisterdialog.h \ - gui/updatewindow.cpp \ - gui/updatewindow.h \ + gui/updaterwindow.cpp \ + gui/updaterwindow.h \ gui/userpalette.cpp \ gui/userpalette.h \ gui/viewport.cpp \ @@ -475,8 +479,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ being.h \ spellmanager.cpp \ spellmanager.h \ - chatlog.cpp \ - chatlog.h \ + chatlogger.cpp \ + chatlogger.h \ client.cpp \ client.h \ channel.cpp \ @@ -535,8 +539,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ listener.h \ localplayer.cpp \ localplayer.h \ - log.cpp \ - log.h \ + logger.cpp \ + logger.h \ main.cpp \ main.h \ map.cpp\ |