index
:
mame
aaron-nl3
aaron-pci-cleanup
arm3_copro
asmjit
cdimono2_wip
cdplay
cdtv_chd-v5
dc_pvr-thread
deprecated
docs_wavwrite
draggable-layout
dribbling-nl
hlsl_aviplay
lisa
lua_engine_ui_refactor_2
m57_troangel-bluesea
make_coco_fdc_fixed
master
n64-angrylion
netlist-generated
new_menus
nl-splitfrogs
nl_dips
nltool-updates
py_regtests
qt6_position-fix
rendlay_vid
saturn_cdblock
saturn_vdp_split
save-experiments
save_structs
shangha3_drop
sound
taitoair_vco
taitowlf_zoom
time-experiments
time-experiments2
vamphalf_misncrft
voodoo_directx11
x86_std-exceptions
xbox_swlist
ymfm-delay
MAME - Multiple Arcade Machine Emulator
summary
refs
log
tree
commit
diff
stats
homepage
log msg
author
committer
range
path:
root
/
src
/
devices
/
machine
/
input_merger.h
Commit message (
Expand
)
Author
Age
Files
Lines
*
(nw) Clean up the mess on master
Vas Crabb
2019-03-26
1
-22
/
+0
*
Revert "conflict resolution (nw)"
andreasnaive
2019-03-25
1
-0
/
+22
*
src/devices: a bit more MCFG macro removal (nw)
Ivan Vangelista
2019-01-18
1
-22
/
+0
*
devcb3
Vas Crabb
2018-07-07
1
-1
/
+2
*
acro removal, disambiguation, debugger side effects (nw)
Vas Crabb
2018-06-15
1
-4
/
+4
*
destaticify initializations (nw) (#3289)
wilbertpol
2018-03-04
1
-3
/
+2
*
input_merger: syncronise on the way in, extend to 32 inputs, make some
Vas Crabb
2017-08-06
1
-36
/
+46
*
fix up input_merger - it needs to save, and it's passive so no reset
Vas Crabb
2017-08-02
1
-2
/
+2
*
Move static data out of devices into the device types. This is a significant...
Vas Crabb
2017-05-14
1
-18
/
+17
*
Remove emu.h from headers (nw)
Olivier Galibert
2017-02-11
1
-1
/
+0
*
NOTICE (TYPE NAME CONSOLIDATION)
Miodrag Milanovic
2016-10-22
1
-3
/
+3
*
Cleanups and version bump
Miodrag Milanovic
2016-07-27
1
-1
/
+1
*
input_merger: Change license to BSD-3
Dirk Best
2016-07-23
1
-1
/
+1
*
Add a device as proof of concept which merges several input lines into a comm...
Dirk Best
2016-07-23
1
-0
/
+107