mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2025-01-24 02:01:17 +00:00
Merge branch 'master' into 'master'
Cleanup whitespaces and ignore build folders See merge request STJr/SRB2!1859
This commit is contained in:
commit
bd2bfe462c
16 changed files with 34 additions and 31 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -21,3 +21,5 @@ Win32_LIB_ASM_Release
|
|||
/assets/debian
|
||||
/make
|
||||
/bin
|
||||
/build
|
||||
/build.*
|
||||
|
|
|
@ -641,4 +641,3 @@ LUALIB_API int luaopen_io (lua_State *L) {
|
|||
lua_pop(L, 1); /* pop environment for default files */
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
#ifdef HWRENDER
|
||||
#include "hw_glob.h"
|
||||
#include "hw_light.h"
|
||||
#include "hw_light.h
|
||||
#include "hw_drv.h"
|
||||
#include "hw_batching.h"
|
||||
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
|
||||
// SONIC ROBO BLAST 2
|
||||
//-----------------------------------------------------------------------------
|
||||
// Copyright (C) 1993-1996 by id Software, Inc.
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
|
||||
// Emacs style mode select -*- C++ -*-
|
||||
// SONIC ROBO BLAST 2
|
||||
//-----------------------------------------------------------------------------
|
||||
|
|
Loading…
Reference in a new issue