1 --- src/lisp/lisp.cpp 2007-09-14 07:43:03.000000000 +0200
2 +++ src/lisp/lisp.cpp~ 2010-09-26 18:05:38.000000000 +0200
4 // along with this program; if not, write to the Free Software
5 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
12 --- src/lisp/lexer.cpp 2007-09-14 08:43:03.000000000 +0300
13 +++ src/lisp/lexer.cpp~ 2008-10-10 12:10:13.000000000 +0200
15 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
22 #include "translation.hpp"
24 --- src/lisp/parser.cpp 2007-09-14 08:43:03.000000000 +0300
25 +++ src/lisp/parser.cpp~ 2008-10-10 12:13:01.000000000 +0200
36 --- src/ui/menusystem.cpp 2007-09-14 08:43:03.000000000 +0300
37 +++ src/ui/menusystem.cpp~ 2008-10-10 12:15:30.000000000 +0200
41 -#include "settings.h"
43 +#include "../settings.h"
44 +#include "../canvas.h"
46 #include "menusystem.h"
49 --- src/menumanager.h 2007-09-14 08:43:03.000000000 +0300
50 +++ src/menumanager.h~ 2008-10-10 12:59:21.000000000 +0200
55 +#include "ui/menuaction.h"
61 --- src/sdl_driver.cpp 2008-10-13 22:29:56.000000000 +0200
62 +++ src/sdl_driver.cpp~ 2008-10-13 22:29:40.000000000 +0200
65 #include <SDL/SDL_ttf.h>
69 #include "sdl_driver.h"
72 --- src/videooptions.cpp 2007-09-14 08:43:03.000000000 +0300
73 +++ src/videooptions.cpp~ 2008-10-10 12:46:10.000000000 +0200