# Conflicts:
#	src/lua_hook.h
#	src/lua_hooklib.c
#	src/p_user.c

# Conflicts:
#	src/lua_baselib.c

# Conflicts:
#	src/lua_baselib.c

# Conflicts:
#	src/lua_baselib.c

Lua: Added player_t input to S_DigitalPlaying, S_MidiPlaying, S_MusicPlaying, S_MusicPaused, S_MusicName

# Conflicts:
#	src/lua_baselib.c

# Conflicts:
#	src/sdl12/mixer_sound.c

# Conflicts:
#	src/sdl12/mixer_sound.c

I don't think there's a reason for copying to a new var.

# Conflicts:
#	src/lua_baselib.c
#	src/nds/i_sound.c
#	src/sdl12/mixer_sound.c
#	src/sdl12/sdl_sound.c
#	src/win32ce/win_snd.c

# Conflicts:
#	src/lua_hook.h

# Conflicts:
#	src/lua_hook.h
#	src/lua_hooklib.c

# Conflicts:
#	src/sdl12/mixer_sound.c

# Conflicts:
#	src/sdl12/mixer_sound.c

# Conflicts:
#	src/lua_baselib.c

# Conflicts:
#	src/nds/i_sound.c
#	src/sdl12/sdl_sound.c
#	src/win32ce/win_snd.c

# Conflicts:
#	src/sdl12/mixer_sound.c

# Conflicts:
#	src/sdl12/mixer_sound.c

# Conflicts:
#	src/sdl12/mixer_sound.c

# Conflicts:
#	src/sdl12/mixer_sound.c

# Conflicts:
#	src/sdl/mixer_sound.c
#	src/sdl12/mixer_sound.c

# Conflicts:
#	src/sdl12/mixer_sound.c

# Conflicts:
#	src/d_netcmd.c
#	src/lua_baselib.c
#	src/nds/i_sound.c
#	src/sdl12/mixer_sound.c
#	src/sdl12/sdl_sound.c
#	src/win32ce/win_snd.c

* Declared I_SetSongPosition, I_GetSongPosition
* Implemented S_PositionMusic and S_GetPositionMusic
* Exposed in console TUNES and lua
* Implemented set position in SDL, SDL12, WIN32
* Implemented get position in WIN32

# Conflicts:
#	src/nds/i_sound.c
#	src/sdl12/mixer_sound.c
#	src/sdl12/sdl_sound.c
#	src/win32ce/win_snd.c