diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-02-05 15:00:58 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-02-05 15:00:58 +0300 |
| commit | 9a3a196dbf633a699c26d0227802a42f025c8bfd (patch) | |
| tree | dfbdb2ff1e2c54d75a2bf6411d3f70df22518c28 /src/Makefile.am | |
| parent | fc17ff22d9df50df9c5d1cf3dc0de358001271ed (diff) | |
| parent | ece36a40d4e9a838cde01075d7681b8fc517b19f (diff) | |
| download | plus-9a3a196dbf633a699c26d0227802a42f025c8bfd.tar.gz plus-9a3a196dbf633a699c26d0227802a42f025c8bfd.tar.bz2 plus-9a3a196dbf633a699c26d0227802a42f025c8bfd.tar.xz plus-9a3a196dbf633a699c26d0227802a42f025c8bfd.zip | |
Merge branch 'master' into stripped
Conflicts:
src/guichan/gui.cpp
src/guichan/include/guichan/sdl/sdlpixel.hpp
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 1893adb80..a241b60b0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -153,6 +153,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ gui/debugwindow.h \ gui/didyouknowwindow.cpp \ gui/didyouknowwindow.h \ + gui/editserverdialog.cpp \ + gui/editserverdialog.h \ gui/emotepopup.cpp \ gui/emotepopup.h \ gui/equipmentwindow.cpp \ @@ -353,6 +355,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ resources/wallpaper.h \ utils/base64.cpp \ utils/base64.h \ + utils/checkutils.cpp \ + utils/checkutils.h \ utils/copynpaste.cpp \ utils/copynpaste.h \ utils/dtor.h \ @@ -362,6 +366,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ utils/mkdir.h \ utils/paths.cpp \ utils/paths.h \ + utils/physfsrwops.cpp \ + utils/physfsrwops.h \ utils/process.cpp \ utils/process.h \ utils/specialfolder.cpp \ |