Update NEWS. A rare case where there are no merge errors but git gets it wrong.

develop
expwnent 2015-01-15 22:53:41 -05:00
parent 49cb05ac89
commit edefeb8ae0
1 changed files with 2 additions and 5 deletions

@ -1,9 +1,4 @@
DFHack Future DFHack Future
New Scripts
hotkey-notes: print key, name, and jump position of hotkeys
Removed
needs_porting/*
Internals Internals
EventManager: fixed crash error with EQUIPMENT_CHANGE event. EventManager: fixed crash error with EQUIPMENT_CHANGE event.
key modifier state exposed to Lua key modifier state exposed to Lua
@ -12,8 +7,10 @@ DFHack Future
New Plugins New Plugins
blueprint: export part of your fortress to quickfort .csv files blueprint: export part of your fortress to quickfort .csv files
New Scripts New Scripts
hotkey-notes: print key, name, and jump position of hotkeys
Removed Removed
embark.lua embark.lua
needs_porting/*
New Tweaks New Tweaks
Misc Improvements Misc Improvements
added support for searching more lists added support for searching more lists