dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branches 'cpp-btree' and 'progsig-sx' into jgrpp

Browse Source
This commit is contained in:
Jonathan G Rennison
2017-02-19 13:57:13 +00:00
parent 064a36b319 418e9f4158 e459ebe2ad
commit fe150d097d
2 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/3rdparty/cpp-btree/btree.h vendored
View File

@@ -100,7 +100,6 @@
#ifndef UTIL_BTREE_BTREE_H__ #ifndef UTIL_BTREE_BTREE_H__
#define UTIL_BTREE_BTREE_H__ #define UTIL_BTREE_BTREE_H__
#include <assert.h>
#include <stddef.h> #include <stddef.h>
#include <string.h> #include <string.h>
#include <sys/types.h> #include <sys/types.h>

1
src/programmable_signals.cpp
View File

@@ -17,7 +17,6 @@
#include "window_func.h" #include "window_func.h"
#include "company_func.h" #include "company_func.h"
#include "cmd_helper.h" #include "cmd_helper.h"
#include <assert.h>
ProgramList _signal_programs; ProgramList _signal_programs;