- merged menu branch back into trunk.
SVN r2768 (trunk)
This commit is contained in:
parent
ec0b07b5e2
commit
579502ab74
86 changed files with 13610 additions and 9229 deletions
|
|
@ -42,7 +42,6 @@
|
|||
#include "m_argv.h"
|
||||
#include "m_bbox.h"
|
||||
#include "m_swap.h"
|
||||
#include "m_menu.h"
|
||||
|
||||
#include "i_video.h"
|
||||
#include "v_video.h"
|
||||
|
|
@ -63,6 +62,7 @@
|
|||
#include "colormatcher.h"
|
||||
#include "v_palette.h"
|
||||
#include "r_sky.h"
|
||||
#include "menu/menu.h"
|
||||
|
||||
|
||||
IMPLEMENT_ABSTRACT_CLASS (DCanvas)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue