[quake3-commits] [ioquake/ioq3] f47876: Use SDL 2 instead of SDL 1.2

Tim Angus tim.angus at roslin.ed.ac.uk
Mon Aug 25 10:03:00 EDT 2014


  Branch: refs/heads/master
  Home:   https://github.com/ioquake/ioq3
  Commit: f478761e07e94b3765b16b2e7d083624a7b05f3a
      https://github.com/ioquake/ioq3/commit/f478761e07e94b3765b16b2e7d083624a7b05f3a
  Author: Tim Angus <tim at ngus.net>
  Date:   2013-01-17 (Thu, 17 Jan 2013)

  Changed paths:
    M Makefile
    M code/client/cl_keys.c
    M code/rend2/qgl.h
    M code/rend2/tr_extensions.c
    M code/renderer/tr_init.c
    M code/renderer/tr_local.h
    M code/renderer/tr_public.h
    M code/sdl/sdl_gamma.c
    M code/sdl/sdl_glimp.c
    M code/sdl/sdl_input.c
    M code/sdl/sdl_snd.c
    M code/sys/sys_local.h
    M code/sys/sys_main.c

  Log Message:
  -----------
  Use SDL 2 instead of SDL 1.2


  Commit: 61ed67bd1a6f6b5821a09185c779394745686609
      https://github.com/ioquake/ioq3/commit/61ed67bd1a6f6b5821a09185c779394745686609
  Author: Tim Angus <tim at ngus.net>
  Date:   2013-01-17 (Thu, 17 Jan 2013)

  Changed paths:
    M code/sdl/sdl_input.c

  Log Message:
  -----------
  Make the mousewheel work


  Commit: 3105d620273a28ceddee56dc20a978d5bcc09b28
      https://github.com/ioquake/ioq3/commit/3105d620273a28ceddee56dc20a978d5bcc09b28
  Author: Tim Angus <tim at ngus.net>
  Date:   2013-01-18 (Fri, 18 Jan 2013)

  Changed paths:
    M code/sdl/sdl_glimp.c

  Log Message:
  -----------
  Allow hardware gamma, in theory


  Commit: aaea838d39f45224c301e3a94eed165145c3e66e
      https://github.com/ioquake/ioq3/commit/aaea838d39f45224c301e3a94eed165145c3e66e
  Author: Tim Angus <tim at ngus.net>
  Date:   2013-01-19 (Sat, 19 Jan 2013)

  Changed paths:
    M code/sdl/sdl_input.c

  Log Message:
  -----------
  Convert SDL text input to UTF-32


  Commit: 9b8711d2e1548675ad957f2602bff154e5690e61
      https://github.com/ioquake/ioq3/commit/9b8711d2e1548675ad957f2602bff154e5690e61
  Author: Tim Angus <tim at ngus.net>
  Date:   2013-01-19 (Sat, 19 Jan 2013)

  Changed paths:
    M code/sdl/sdl_glimp.c

  Log Message:
  -----------
  Fix wacky patch for r_ignorehwgamma


  Commit: 42586b782bed084844c0f20747018a9f9757c665
      https://github.com/ioquake/ioq3/commit/42586b782bed084844c0f20747018a9f9757c665
  Author: Tim Angus <tim at ngus.net>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    M code/sdl/sdl_input.c

  Log Message:
  -----------
  Improve console key situation


  Commit: b43f766141f2bad7ab86b80fa30b2c32c9c2a68b
      https://github.com/ioquake/ioq3/commit/b43f766141f2bad7ab86b80fa30b2c32c9c2a68b
  Author: Tim Angus <tim at ngus.net>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    M Makefile
    R code/SDL12/include/SDL.h
    R code/SDL12/include/SDL_active.h
    R code/SDL12/include/SDL_audio.h
    R code/SDL12/include/SDL_byteorder.h
    R code/SDL12/include/SDL_cdrom.h
    R code/SDL12/include/SDL_config.h
    R code/SDL12/include/SDL_config_amiga.h
    R code/SDL12/include/SDL_config_dreamcast.h
    R code/SDL12/include/SDL_config_macos.h
    R code/SDL12/include/SDL_config_macosx.h
    R code/SDL12/include/SDL_config_minimal.h
    R code/SDL12/include/SDL_config_nds.h
    R code/SDL12/include/SDL_config_os2.h
    R code/SDL12/include/SDL_config_symbian.h
    R code/SDL12/include/SDL_config_win32.h
    R code/SDL12/include/SDL_copying.h
    R code/SDL12/include/SDL_cpuinfo.h
    R code/SDL12/include/SDL_endian.h
    R code/SDL12/include/SDL_error.h
    R code/SDL12/include/SDL_events.h
    R code/SDL12/include/SDL_getenv.h
    R code/SDL12/include/SDL_joystick.h
    R code/SDL12/include/SDL_keyboard.h
    R code/SDL12/include/SDL_keysym.h
    R code/SDL12/include/SDL_loadso.h
    R code/SDL12/include/SDL_main.h
    R code/SDL12/include/SDL_mouse.h
    R code/SDL12/include/SDL_mutex.h
    R code/SDL12/include/SDL_name.h
    R code/SDL12/include/SDL_opengl.h
    R code/SDL12/include/SDL_platform.h
    R code/SDL12/include/SDL_quit.h
    R code/SDL12/include/SDL_rwops.h
    R code/SDL12/include/SDL_stdinc.h
    R code/SDL12/include/SDL_syswm.h
    R code/SDL12/include/SDL_thread.h
    R code/SDL12/include/SDL_timer.h
    R code/SDL12/include/SDL_types.h
    R code/SDL12/include/SDL_version.h
    R code/SDL12/include/SDL_video.h
    R code/SDL12/include/begin_code.h
    R code/SDL12/include/close_code.h
    A code/SDL2/include/SDL.h
    A code/SDL2/include/SDL_assert.h
    A code/SDL2/include/SDL_atomic.h
    A code/SDL2/include/SDL_audio.h
    A code/SDL2/include/SDL_blendmode.h
    A code/SDL2/include/SDL_clipboard.h
    A code/SDL2/include/SDL_config.h
    A code/SDL2/include/SDL_config_android.h
    A code/SDL2/include/SDL_config_iphoneos.h
    A code/SDL2/include/SDL_config_macosx.h
    A code/SDL2/include/SDL_config_minimal.h
    A code/SDL2/include/SDL_config_nintendods.h
    A code/SDL2/include/SDL_config_pandora.h
    A code/SDL2/include/SDL_config_windows.h
    A code/SDL2/include/SDL_config_wiz.h
    A code/SDL2/include/SDL_copying.h
    A code/SDL2/include/SDL_cpuinfo.h
    A code/SDL2/include/SDL_endian.h
    A code/SDL2/include/SDL_error.h
    A code/SDL2/include/SDL_events.h
    A code/SDL2/include/SDL_gamecontroller.h
    A code/SDL2/include/SDL_gesture.h
    A code/SDL2/include/SDL_haptic.h
    A code/SDL2/include/SDL_hints.h
    A code/SDL2/include/SDL_input.h
    A code/SDL2/include/SDL_joystick.h
    A code/SDL2/include/SDL_keyboard.h
    A code/SDL2/include/SDL_keycode.h
    A code/SDL2/include/SDL_loadso.h
    A code/SDL2/include/SDL_log.h
    A code/SDL2/include/SDL_main.h
    A code/SDL2/include/SDL_messagebox.h
    A code/SDL2/include/SDL_mouse.h
    A code/SDL2/include/SDL_mutex.h
    A code/SDL2/include/SDL_name.h
    A code/SDL2/include/SDL_opengl.h
    A code/SDL2/include/SDL_opengles.h
    A code/SDL2/include/SDL_opengles2.h
    A code/SDL2/include/SDL_pixels.h
    A code/SDL2/include/SDL_platform.h
    A code/SDL2/include/SDL_power.h
    A code/SDL2/include/SDL_quit.h
    A code/SDL2/include/SDL_rect.h
    A code/SDL2/include/SDL_render.h
    A code/SDL2/include/SDL_revision.h
    A code/SDL2/include/SDL_rwops.h
    A code/SDL2/include/SDL_scancode.h
    A code/SDL2/include/SDL_shape.h
    A code/SDL2/include/SDL_stdinc.h
    A code/SDL2/include/SDL_surface.h
    A code/SDL2/include/SDL_system.h
    A code/SDL2/include/SDL_syswm.h
    A code/SDL2/include/SDL_test.h
    A code/SDL2/include/SDL_test_assert.h
    A code/SDL2/include/SDL_test_common.h
    A code/SDL2/include/SDL_test_compare.h
    A code/SDL2/include/SDL_test_crc32.h
    A code/SDL2/include/SDL_test_font.h
    A code/SDL2/include/SDL_test_fuzzer.h
    A code/SDL2/include/SDL_test_harness.h
    A code/SDL2/include/SDL_test_images.h
    A code/SDL2/include/SDL_test_log.h
    A code/SDL2/include/SDL_test_md5.h
    A code/SDL2/include/SDL_test_random.h
    A code/SDL2/include/SDL_thread.h
    A code/SDL2/include/SDL_timer.h
    A code/SDL2/include/SDL_touch.h
    A code/SDL2/include/SDL_types.h
    A code/SDL2/include/SDL_version.h
    A code/SDL2/include/SDL_video.h
    A code/SDL2/include/begin_code.h
    A code/SDL2/include/close_code.h
    R code/libs/win32/SDL.lib
    R code/libs/win32/SDLmain.lib
    R code/libs/win32/libSDL.dll.a
    R code/libs/win32/libSDL.la
    A code/libs/win32/libSDL2.a
    A code/libs/win32/libSDL2.dll
    A code/libs/win32/libSDL2.dll.a
    A code/libs/win32/libSDL2main.a
    R code/libs/win32/libSDLmain.a
    R code/libs/win64/SDL.lib
    R code/libs/win64/SDLmain.lib
    A code/libs/win64/libSDL2.a
    A code/libs/win64/libSDL2.dll
    A code/libs/win64/libSDL2.dll.a
    A code/libs/win64/libSDL2main.a
    R code/libs/win64/libSDL64.dll.a
    R code/libs/win64/libSDLmain.a

  Log Message:
  -----------
  Update bundled SDL headers/libs


  Commit: b9355c5f129344db24913bb7e9b1c2f11461e7e4
      https://github.com/ioquake/ioq3/commit/b9355c5f129344db24913bb7e9b1c2f11461e7e4
  Author: Tim Angus <tim at ngus.net>
  Date:   2013-01-28 (Mon, 28 Jan 2013)

  Changed paths:
    M code/sys/sys_win32.c

  Log Message:
  -----------
  The in_mouse stuff makes no sense in SDL2


  Commit: d9d52f0306f3e3a65fcc9a916825a8d106b4b87f
      https://github.com/ioquake/ioq3/commit/d9d52f0306f3e3a65fcc9a916825a8d106b4b87f
  Author: Tim Angus <tim.angus at roslin.ed.ac.uk>
  Date:   2013-05-08 (Wed, 08 May 2013)

  Changed paths:
    A .travis.yml
    M Makefile
    M README
    M code/AL/VERSION
    M code/AL/al.h
    M code/AL/alc.h
    R code/AL/alctypes.h
    A code/AL/alext.h
    R code/AL/altypes.h
    R code/AL/alut.h
    A code/AL/efx-creative.h
    A code/AL/efx-presets.h
    A code/AL/efx.h
    M code/asm/ftola.c
    M code/botlib/be_aas_def.h
    M code/botlib/be_aas_main.c
    M code/botlib/be_aas_main.h
    M code/botlib/be_aas_reach.c
    M code/botlib/be_aas_route.c
    M code/botlib/be_ai_chat.c
    M code/botlib/be_ai_goal.c
    M code/botlib/be_ai_weap.c
    M code/botlib/be_ai_weight.c
    M code/botlib/be_interface.c
    M code/botlib/botlib.h
    M code/botlib/l_precomp.c
    R code/botlib/lcc.mak
    R code/botlib/linux-i386.mak
    M code/cgame/cg_local.h
    M code/client/cl_cin.c
    M code/client/cl_console.c
    M code/client/cl_curl.c
    M code/client/cl_keys.c
    M code/client/cl_main.c
    M code/client/cl_parse.c
    M code/client/cl_ui.c
    M code/client/client.h
    M code/client/snd_adpcm.c
    M code/client/snd_codec.c
    M code/client/snd_codec.h
    A code/client/snd_codec_opus.c
    M code/client/snd_dma.c
    M code/client/snd_mix.c
    M code/client/snd_openal.c
    M code/client/snd_wavelet.c
    M code/game/g_bot.c
    M code/game/g_client.c
    M code/game/g_cmds.c
    M code/game/g_combat.c
    M code/game/g_local.h
    M code/game/g_main.c
    A code/libogg-1.3.0/include/ogg/config_types.h
    A code/libogg-1.3.0/include/ogg/ogg.h
    A code/libogg-1.3.0/include/ogg/os_types.h
    A code/libogg-1.3.0/src/bitwise.c
    A code/libogg-1.3.0/src/framing.c
    M code/null/null_glimp.c
    M code/null/null_main.c
    A code/opus-1.0.2/celt/_kiss_fft_guts.h
    A code/opus-1.0.2/celt/arch.h
    A code/opus-1.0.2/celt/bands.c
    A code/opus-1.0.2/celt/bands.h
    A code/opus-1.0.2/celt/celt.c
    A code/opus-1.0.2/celt/celt.h
    A code/opus-1.0.2/celt/celt_lpc.c
    A code/opus-1.0.2/celt/celt_lpc.h
    A code/opus-1.0.2/celt/cwrs.c
    A code/opus-1.0.2/celt/cwrs.h
    A code/opus-1.0.2/celt/ecintrin.h
    A code/opus-1.0.2/celt/entcode.c
    A code/opus-1.0.2/celt/entcode.h
    A code/opus-1.0.2/celt/entdec.c
    A code/opus-1.0.2/celt/entdec.h
    A code/opus-1.0.2/celt/entenc.c
    A code/opus-1.0.2/celt/entenc.h
    A code/opus-1.0.2/celt/fixed_debug.h
    A code/opus-1.0.2/celt/fixed_generic.h
    A code/opus-1.0.2/celt/float_cast.h
    A code/opus-1.0.2/celt/kiss_fft.c
    A code/opus-1.0.2/celt/kiss_fft.h
    A code/opus-1.0.2/celt/laplace.c
    A code/opus-1.0.2/celt/laplace.h
    A code/opus-1.0.2/celt/mathops.c
    A code/opus-1.0.2/celt/mathops.h
    A code/opus-1.0.2/celt/mdct.c
    A code/opus-1.0.2/celt/mdct.h
    A code/opus-1.0.2/celt/mfrngcod.h
    A code/opus-1.0.2/celt/modes.c
    A code/opus-1.0.2/celt/modes.h
    A code/opus-1.0.2/celt/opus_custom_demo.c
    A code/opus-1.0.2/celt/os_support.h
    A code/opus-1.0.2/celt/pitch.c
    A code/opus-1.0.2/celt/pitch.h
    A code/opus-1.0.2/celt/quant_bands.c
    A code/opus-1.0.2/celt/quant_bands.h
    A code/opus-1.0.2/celt/rate.c
    A code/opus-1.0.2/celt/rate.h
    A code/opus-1.0.2/celt/stack_alloc.h
    A code/opus-1.0.2/celt/static_modes_fixed.h
    A code/opus-1.0.2/celt/static_modes_float.h
    A code/opus-1.0.2/celt/vq.c
    A code/opus-1.0.2/celt/vq.h
    A code/opus-1.0.2/include/opus.h
    A code/opus-1.0.2/include/opus_custom.h
    A code/opus-1.0.2/include/opus_defines.h
    A code/opus-1.0.2/include/opus_multistream.h
    A code/opus-1.0.2/include/opus_types.h
    A code/opus-1.0.2/silk/A2NLSF.c
    A code/opus-1.0.2/silk/API.h
    A code/opus-1.0.2/silk/CNG.c
    A code/opus-1.0.2/silk/HP_variable_cutoff.c
    A code/opus-1.0.2/silk/Inlines.h
    A code/opus-1.0.2/silk/LPC_analysis_filter.c
    A code/opus-1.0.2/silk/LPC_inv_pred_gain.c
    A code/opus-1.0.2/silk/LP_variable_cutoff.c
    A code/opus-1.0.2/silk/MacroCount.h
    A code/opus-1.0.2/silk/MacroDebug.h
    A code/opus-1.0.2/silk/NLSF2A.c
    A code/opus-1.0.2/silk/NLSF_VQ.c
    A code/opus-1.0.2/silk/NLSF_VQ_weights_laroia.c
    A code/opus-1.0.2/silk/NLSF_decode.c
    A code/opus-1.0.2/silk/NLSF_del_dec_quant.c
    A code/opus-1.0.2/silk/NLSF_encode.c
    A code/opus-1.0.2/silk/NLSF_stabilize.c
    A code/opus-1.0.2/silk/NLSF_unpack.c
    A code/opus-1.0.2/silk/NSQ.c
    A code/opus-1.0.2/silk/NSQ_del_dec.c
    A code/opus-1.0.2/silk/PLC.c
    A code/opus-1.0.2/silk/PLC.h
    A code/opus-1.0.2/silk/SigProc_FIX.h
    A code/opus-1.0.2/silk/VAD.c
    A code/opus-1.0.2/silk/VQ_WMat_EC.c
    A code/opus-1.0.2/silk/ana_filt_bank_1.c
    A code/opus-1.0.2/silk/biquad_alt.c
    A code/opus-1.0.2/silk/bwexpander.c
    A code/opus-1.0.2/silk/bwexpander_32.c
    A code/opus-1.0.2/silk/check_control_input.c
    A code/opus-1.0.2/silk/code_signs.c
    A code/opus-1.0.2/silk/control.h
    A code/opus-1.0.2/silk/control_SNR.c
    A code/opus-1.0.2/silk/control_audio_bandwidth.c
    A code/opus-1.0.2/silk/control_codec.c
    A code/opus-1.0.2/silk/debug.c
    A code/opus-1.0.2/silk/debug.h
    A code/opus-1.0.2/silk/dec_API.c
    A code/opus-1.0.2/silk/decode_core.c
    A code/opus-1.0.2/silk/decode_frame.c
    A code/opus-1.0.2/silk/decode_indices.c
    A code/opus-1.0.2/silk/decode_parameters.c
    A code/opus-1.0.2/silk/decode_pitch.c
    A code/opus-1.0.2/silk/decode_pulses.c
    A code/opus-1.0.2/silk/decoder_set_fs.c
    A code/opus-1.0.2/silk/define.h
    A code/opus-1.0.2/silk/enc_API.c
    A code/opus-1.0.2/silk/encode_indices.c
    A code/opus-1.0.2/silk/encode_pulses.c
    A code/opus-1.0.2/silk/errors.h
    A code/opus-1.0.2/silk/fixed/LTP_analysis_filter_FIX.c
    A code/opus-1.0.2/silk/fixed/LTP_scale_ctrl_FIX.c
    A code/opus-1.0.2/silk/fixed/apply_sine_window_FIX.c
    A code/opus-1.0.2/silk/fixed/autocorr_FIX.c
    A code/opus-1.0.2/silk/fixed/burg_modified_FIX.c
    A code/opus-1.0.2/silk/fixed/corrMatrix_FIX.c
    A code/opus-1.0.2/silk/fixed/encode_frame_FIX.c
    A code/opus-1.0.2/silk/fixed/find_LPC_FIX.c
    A code/opus-1.0.2/silk/fixed/find_LTP_FIX.c
    A code/opus-1.0.2/silk/fixed/find_pitch_lags_FIX.c
    A code/opus-1.0.2/silk/fixed/find_pred_coefs_FIX.c
    A code/opus-1.0.2/silk/fixed/k2a_FIX.c
    A code/opus-1.0.2/silk/fixed/k2a_Q16_FIX.c
    A code/opus-1.0.2/silk/fixed/main_FIX.h
    A code/opus-1.0.2/silk/fixed/noise_shape_analysis_FIX.c
    A code/opus-1.0.2/silk/fixed/pitch_analysis_core_FIX.c
    A code/opus-1.0.2/silk/fixed/prefilter_FIX.c
    A code/opus-1.0.2/silk/fixed/process_gains_FIX.c
    A code/opus-1.0.2/silk/fixed/regularize_correlations_FIX.c
    A code/opus-1.0.2/silk/fixed/residual_energy16_FIX.c
    A code/opus-1.0.2/silk/fixed/residual_energy_FIX.c
    A code/opus-1.0.2/silk/fixed/schur64_FIX.c
    A code/opus-1.0.2/silk/fixed/schur_FIX.c
    A code/opus-1.0.2/silk/fixed/solve_LS_FIX.c
    A code/opus-1.0.2/silk/fixed/structs_FIX.h
    A code/opus-1.0.2/silk/fixed/vector_ops_FIX.c
    A code/opus-1.0.2/silk/fixed/warped_autocorrelation_FIX.c
    A code/opus-1.0.2/silk/float/LPC_analysis_filter_FLP.c
    A code/opus-1.0.2/silk/float/LPC_inv_pred_gain_FLP.c
    A code/opus-1.0.2/silk/float/LTP_analysis_filter_FLP.c
    A code/opus-1.0.2/silk/float/LTP_scale_ctrl_FLP.c
    A code/opus-1.0.2/silk/float/SigProc_FLP.h
    A code/opus-1.0.2/silk/float/apply_sine_window_FLP.c
    A code/opus-1.0.2/silk/float/autocorrelation_FLP.c
    A code/opus-1.0.2/silk/float/burg_modified_FLP.c
    A code/opus-1.0.2/silk/float/bwexpander_FLP.c
    A code/opus-1.0.2/silk/float/corrMatrix_FLP.c
    A code/opus-1.0.2/silk/float/encode_frame_FLP.c
    A code/opus-1.0.2/silk/float/energy_FLP.c
    A code/opus-1.0.2/silk/float/find_LPC_FLP.c
    A code/opus-1.0.2/silk/float/find_LTP_FLP.c
    A code/opus-1.0.2/silk/float/find_pitch_lags_FLP.c
    A code/opus-1.0.2/silk/float/find_pred_coefs_FLP.c
    A code/opus-1.0.2/silk/float/inner_product_FLP.c
    A code/opus-1.0.2/silk/float/k2a_FLP.c
    A code/opus-1.0.2/silk/float/levinsondurbin_FLP.c
    A code/opus-1.0.2/silk/float/main_FLP.h
    A code/opus-1.0.2/silk/float/noise_shape_analysis_FLP.c
    A code/opus-1.0.2/silk/float/pitch_analysis_core_FLP.c
    A code/opus-1.0.2/silk/float/prefilter_FLP.c
    A code/opus-1.0.2/silk/float/process_gains_FLP.c
    A code/opus-1.0.2/silk/float/regularize_correlations_FLP.c
    A code/opus-1.0.2/silk/float/residual_energy_FLP.c
    A code/opus-1.0.2/silk/float/scale_copy_vector_FLP.c
    A code/opus-1.0.2/silk/float/scale_vector_FLP.c
    A code/opus-1.0.2/silk/float/schur_FLP.c
    A code/opus-1.0.2/silk/float/solve_LS_FLP.c
    A code/opus-1.0.2/silk/float/sort_FLP.c
    A code/opus-1.0.2/silk/float/structs_FLP.h
    A code/opus-1.0.2/silk/float/warped_autocorrelation_FLP.c
    A code/opus-1.0.2/silk/float/wrappers_FLP.c
    A code/opus-1.0.2/silk/gain_quant.c
    A code/opus-1.0.2/silk/init_decoder.c
    A code/opus-1.0.2/silk/init_encoder.c
    A code/opus-1.0.2/silk/inner_prod_aligned.c
    A code/opus-1.0.2/silk/interpolate.c
    A code/opus-1.0.2/silk/lin2log.c
    A code/opus-1.0.2/silk/log2lin.c
    A code/opus-1.0.2/silk/macros.h
    A code/opus-1.0.2/silk/main.h
    A code/opus-1.0.2/silk/pitch_est_defines.h
    A code/opus-1.0.2/silk/pitch_est_tables.c
    A code/opus-1.0.2/silk/process_NLSFs.c
    A code/opus-1.0.2/silk/quant_LTP_gains.c
    A code/opus-1.0.2/silk/resampler.c
    A code/opus-1.0.2/silk/resampler_down2.c
    A code/opus-1.0.2/silk/resampler_down2_3.c
    A code/opus-1.0.2/silk/resampler_private.h
    A code/opus-1.0.2/silk/resampler_private_AR2.c
    A code/opus-1.0.2/silk/resampler_private_IIR_FIR.c
    A code/opus-1.0.2/silk/resampler_private_down_FIR.c
    A code/opus-1.0.2/silk/resampler_private_up2_HQ.c
    A code/opus-1.0.2/silk/resampler_rom.c
    A code/opus-1.0.2/silk/resampler_rom.h
    A code/opus-1.0.2/silk/resampler_structs.h
    A code/opus-1.0.2/silk/shell_coder.c
    A code/opus-1.0.2/silk/sigm_Q15.c
    A code/opus-1.0.2/silk/sort.c
    A code/opus-1.0.2/silk/stereo_LR_to_MS.c
    A code/opus-1.0.2/silk/stereo_MS_to_LR.c
    A code/opus-1.0.2/silk/stereo_decode_pred.c
    A code/opus-1.0.2/silk/stereo_encode_pred.c
    A code/opus-1.0.2/silk/stereo_find_predictor.c
    A code/opus-1.0.2/silk/stereo_quant_pred.c
    A code/opus-1.0.2/silk/structs.h
    A code/opus-1.0.2/silk/sum_sqr_shift.c
    A code/opus-1.0.2/silk/table_LSF_cos.c
    A code/opus-1.0.2/silk/tables.h
    A code/opus-1.0.2/silk/tables_LTP.c
    A code/opus-1.0.2/silk/tables_NLSF_CB_NB_MB.c
    A code/opus-1.0.2/silk/tables_NLSF_CB_WB.c
    A code/opus-1.0.2/silk/tables_gain.c
    A code/opus-1.0.2/silk/tables_other.c
    A code/opus-1.0.2/silk/tables_pitch_lag.c
    A code/opus-1.0.2/silk/tables_pulses_per_block.c
    A code/opus-1.0.2/silk/tuning_parameters.h
    A code/opus-1.0.2/silk/typedef.h
    A code/opus-1.0.2/src/opus.c
    A code/opus-1.0.2/src/opus_decoder.c
    A code/opus-1.0.2/src/opus_encoder.c
    A code/opus-1.0.2/src/opus_multistream.c
    A code/opus-1.0.2/src/opus_private.h
    A code/opus-1.0.2/src/repacketizer.c
    A code/opusfile-0.2/include/opusfile.h
    A code/opusfile-0.2/src/http.c
    A code/opusfile-0.2/src/info.c
    A code/opusfile-0.2/src/internal.c
    A code/opusfile-0.2/src/internal.h
    A code/opusfile-0.2/src/opusfile.c
    A code/opusfile-0.2/src/stream.c
    R code/qcommon/vm_x86_64.c
    R code/qcommon/vm_x86_64_assembler.c
    R code/rend2/glsl/bokeh_fp.glsl
    R code/rend2/glsl/bokeh_vp.glsl
    R code/rend2/glsl/calclevels4x_fp.glsl
    R code/rend2/glsl/calclevels4x_vp.glsl
    R code/rend2/glsl/depthblur_fp.glsl
    R code/rend2/glsl/depthblur_vp.glsl
    R code/rend2/glsl/dlight_fp.glsl

  Log Message:
  -----------
  Merge branch 'master' into sdl2

Conflicts:
	Makefile
	code/renderercommon/qgl.h
	code/renderergl1/tr_local.h
	code/sdl/sdl_glimp.c


  Commit: bde7665462ff6336d083168a71564ac89d68f46b
      https://github.com/ioquake/ioq3/commit/bde7665462ff6336d083168a71564ac89d68f46b
  Author: Tim Angus <tim at ngus.net>
  Date:   2013-08-16 (Fri, 16 Aug 2013)

  Changed paths:
    M .gitignore
    M Makefile
    M code/botlib/be_ai_char.c
    M code/botlib/be_ai_chat.c
    M code/botlib/be_ai_goal.c
    M code/botlib/be_ai_move.c
    M code/cgame/cg_particles.c
    M code/cgame/cg_predict.c
    M code/client/cl_cgame.c
    M code/client/cl_console.c
    M code/client/cl_keys.c
    M code/client/cl_main.c
    M code/client/cl_parse.c
    M code/client/snd_mix.c
    M code/client/snd_openal.c
    M code/q3_ui/ui_players.c
    M code/qcommon/common.c
    M code/qcommon/files.c
    M code/qcommon/q_shared.c
    M code/qcommon/q_shared.h
    M code/qcommon/qcommon.h
    M code/qcommon/vm_powerpc.c
    M code/qcommon/vm_sparc.c
    M code/qcommon/vm_x86.c
    M code/renderercommon/tr_font.c
    M code/renderercommon/tr_image_jpg.c
    M code/renderergl1/tr_backend.c
    M code/renderergl1/tr_cmds.c
    M code/renderergl1/tr_flares.c
    M code/renderergl1/tr_local.h
    M code/renderergl1/tr_model.c
    M code/renderergl1/tr_model_iqm.c
    M code/renderergl1/tr_shader.c
    M code/renderergl1/tr_sky.c
    M code/renderergl1/tr_surface.c
    M code/renderergl2/tr_bsp.c
    M code/renderergl2/tr_cmds.c
    M code/renderergl2/tr_extratypes.h
    M code/renderergl2/tr_fbo.c
    M code/renderergl2/tr_flares.c
    M code/renderergl2/tr_glsl.c
    M code/renderergl2/tr_local.h
    M code/renderergl2/tr_model.c
    M code/renderergl2/tr_model_iqm.c
    M code/renderergl2/tr_shade.c
    M code/renderergl2/tr_shade_calc.c
    M code/renderergl2/tr_shader.c
    M code/renderergl2/tr_surface.c
    M code/renderergl2/tr_world.c
    M code/sdl/sdl_glimp.c
    M code/sdl/sdl_input.c
    M code/server/server.h
    M code/server/sv_client.c
    M code/server/sv_main.c
    M code/server/sv_world.c
    M code/sys/con_win32.c
    M code/sys/sys_unix.c
    M code/tools/asm/q3asm.c
    M code/tools/lcc/cpp/cpp.c
    M code/tools/lcc/cpp/include.c
    M code/tools/lcc/cpp/macro.c
    M code/ui/ui_main.c
    M code/ui/ui_players.c
    M code/zlib/inffast.c
    M jenkins-ci-build.sh
    A make-macosx-app.sh
    M make-macosx-ub.sh
    M make-macosx.sh
    M misc/osxfe/ioquake3fe/Info.plist
    M misc/osxfe/ioquake3fe/ioquake3fe.xcodeproj/project.pbxproj
    A misc/quake3_flat.icns
    A misc/quake3_flat.iconset/icon_128x128.png
    A misc/quake3_flat.iconset/icon_128x128 at 2x.png
    A misc/quake3_flat.iconset/icon_16x16.png
    A misc/quake3_flat.iconset/icon_16x16 at 2x.png
    A misc/quake3_flat.iconset/icon_256x256.png
    A misc/quake3_flat.iconset/icon_256x256 at 2x.png
    A misc/quake3_flat.iconset/icon_32x32.png
    A misc/quake3_flat.iconset/icon_32x32 at 2x.png
    A misc/quake3_flat.iconset/icon_512x512.png
    A misc/quake3_flat.iconset/icon_512x512 at 2x.png
    A misc/xcode/botlib.xcodeproj/project.pbxproj
    A misc/xcode/cgame.xcodeproj/project.pbxproj
    A misc/xcode/game.xcodeproj/project.pbxproj
    A misc/xcode/ioquake3-Info.plist
    A misc/xcode/ioquake3-Prefix.pch
    A misc/xcode/ioquake3.xcodeproj/project.pbxproj
    A misc/xcode/ioquake3.xcworkspace/contents.xcworkspacedata
    A misc/xcode/ioquake3.xcworkspace/xcshareddata/xcschemes/all game.xcscheme
    A misc/xcode/ioquake3.xcworkspace/xcshareddata/xcschemes/all ioquake3.xcscheme
    A misc/xcode/jpeg8.xcodeproj/project.pbxproj
    A misc/xcode/q3_ui.xcodeproj/project.pbxproj
    A misc/xcode/renderer_opengl1.xcodeproj/project.pbxproj
    A misc/xcode/renderer_opengl2.xcodeproj/project.pbxproj
    A misc/xcode/speex.xcodeproj/project.pbxproj
    A misc/xcode/ui.xcodeproj/project.pbxproj
    A misc/xcode/xcode-readme.txt

  Log Message:
  -----------
  Merge branch 'master' into sdl2

Conflicts:
	code/sdl/sdl_input.c


  Commit: e6d075e165e96429d2c5246facfd28cd3b817321
      https://github.com/ioquake/ioq3/commit/e6d075e165e96429d2c5246facfd28cd3b817321
  Author: Tim Angus <tim at ngus.net>
  Date:   2013-08-18 (Sun, 18 Aug 2013)

  Changed paths:
    R code/libs/macosx/libSDL-1.2.0.dylib
    A code/libs/macosx/libSDL2-2.0.0.dylib
    A code/libs/macosx/libSDL2main.a
    R code/libs/macosx/libSDLmain.a

  Log Message:
  -----------
  SDL2 libs for OSX, thanks to MAN-AT-ARMS


  Commit: e13773de6941ea2ca2e05523ba4e5c7d4230ee55
      https://github.com/ioquake/ioq3/commit/e13773de6941ea2ca2e05523ba4e5c7d4230ee55
  Author: Tim Angus <tim at ngus.net>
  Date:   2013-08-18 (Sun, 18 Aug 2013)

  Changed paths:
    M code/libs/win32/libSDL2.a
    M code/libs/win32/libSDL2.dll
    M code/libs/win32/libSDL2.dll.a
    M code/libs/win32/libSDL2main.a
    M code/libs/win64/libSDL2.a
    M code/libs/win64/libSDL2.dll
    M code/libs/win64/libSDL2.dll.a
    M code/libs/win64/libSDL2main.a

  Log Message:
  -----------
  Update prebuilt SDL2 libs for Windows


  Commit: 32a859c68067af18f9c1aaa33040305f8cb9297e
      https://github.com/ioquake/ioq3/commit/32a859c68067af18f9c1aaa33040305f8cb9297e
  Author: Tim Angus <tim at ngus.net>
  Date:   2013-08-19 (Mon, 19 Aug 2013)

  Changed paths:
    M Makefile
    M code/libs/macosx/libSDL2-2.0.0.dylib
    M code/libs/macosx/libSDL2main.a

  Log Message:
  -----------
  More updates to SDL2 libs from MAN-AT-ARMS


  Commit: 273b9ab77e6658692126a6568d1383f37ea7ef85
      https://github.com/ioquake/ioq3/commit/273b9ab77e6658692126a6568d1383f37ea7ef85
  Author: Tim Angus <tim at ngus.net>
  Date:   2013-08-20 (Tue, 20 Aug 2013)

  Changed paths:
    M code/SDL2/include/SDL.h
    M code/SDL2/include/SDL_assert.h
    M code/SDL2/include/SDL_atomic.h
    M code/SDL2/include/SDL_audio.h
    A code/SDL2/include/SDL_bits.h
    M code/SDL2/include/SDL_blendmode.h
    M code/SDL2/include/SDL_clipboard.h
    M code/SDL2/include/SDL_config.h
    M code/SDL2/include/SDL_config_android.h
    M code/SDL2/include/SDL_config_iphoneos.h
    M code/SDL2/include/SDL_config_macosx.h
    M code/SDL2/include/SDL_config_minimal.h
    M code/SDL2/include/SDL_config_pandora.h
    A code/SDL2/include/SDL_config_psp.h
    M code/SDL2/include/SDL_config_windows.h
    M code/SDL2/include/SDL_config_wiz.h
    M code/SDL2/include/SDL_copying.h
    M code/SDL2/include/SDL_cpuinfo.h
    M code/SDL2/include/SDL_endian.h
    M code/SDL2/include/SDL_error.h
    M code/SDL2/include/SDL_events.h
    M code/SDL2/include/SDL_gamecontroller.h
    M code/SDL2/include/SDL_gesture.h
    M code/SDL2/include/SDL_haptic.h
    M code/SDL2/include/SDL_hints.h
    M code/SDL2/include/SDL_joystick.h
    M code/SDL2/include/SDL_keyboard.h
    M code/SDL2/include/SDL_keycode.h
    M code/SDL2/include/SDL_loadso.h
    M code/SDL2/include/SDL_log.h
    M code/SDL2/include/SDL_main.h
    M code/SDL2/include/SDL_messagebox.h
    M code/SDL2/include/SDL_mouse.h
    M code/SDL2/include/SDL_mutex.h
    M code/SDL2/include/SDL_name.h
    M code/SDL2/include/SDL_opengl.h
    M code/SDL2/include/SDL_opengles.h
    M code/SDL2/include/SDL_opengles2.h
    M code/SDL2/include/SDL_pixels.h
    M code/SDL2/include/SDL_platform.h
    M code/SDL2/include/SDL_power.h
    M code/SDL2/include/SDL_quit.h
    M code/SDL2/include/SDL_rect.h
    M code/SDL2/include/SDL_render.h
    M code/SDL2/include/SDL_revision.h
    M code/SDL2/include/SDL_rwops.h
    M code/SDL2/include/SDL_scancode.h
    M code/SDL2/include/SDL_shape.h
    M code/SDL2/include/SDL_stdinc.h
    M code/SDL2/include/SDL_surface.h
    M code/SDL2/include/SDL_system.h
    M code/SDL2/include/SDL_syswm.h
    M code/SDL2/include/SDL_test.h
    M code/SDL2/include/SDL_test_assert.h
    M code/SDL2/include/SDL_test_common.h
    M code/SDL2/include/SDL_test_compare.h
    M code/SDL2/include/SDL_test_crc32.h
    M code/SDL2/include/SDL_test_font.h
    M code/SDL2/include/SDL_test_fuzzer.h
    M code/SDL2/include/SDL_test_harness.h
    M code/SDL2/include/SDL_test_images.h
    M code/SDL2/include/SDL_test_log.h
    M code/SDL2/include/SDL_test_md5.h
    M code/SDL2/include/SDL_test_random.h
    M code/SDL2/include/SDL_thread.h
    M code/SDL2/include/SDL_timer.h
    M code/SDL2/include/SDL_touch.h
    M code/SDL2/include/SDL_types.h
    M code/SDL2/include/SDL_version.h
    M code/SDL2/include/SDL_video.h
    M code/SDL2/include/begin_code.h
    M code/SDL2/include/close_code.h

  Log Message:
  -----------
  Update SDL2 headers... oops


  Commit: fb9270306b142ad9db63e243cadc2a70347bae33
      https://github.com/ioquake/ioq3/commit/fb9270306b142ad9db63e243cadc2a70347bae33
  Author: Tim Angus <tim at ngus.net>
  Date:   2013-08-29 (Thu, 29 Aug 2013)

  Changed paths:
    M code/sdl/sdl_glimp.c

  Log Message:
  -----------
  Fix initial window position being top left


  Commit: 58b8cfa0b3fb926ffc6c699967199ef18ed0fda7
      https://github.com/ioquake/ioq3/commit/58b8cfa0b3fb926ffc6c699967199ef18ed0fda7
  Author: Tim Angus <tim at ngus.net>
  Date:   2013-09-15 (Sun, 15 Sep 2013)

  Changed paths:
    M code/sdl/sdl_glimp.c
    M code/sys/sys_main.c

  Log Message:
  -----------
  Various fixes from Fuma


  Commit: 76e49b668efe7a16b66635e42187194d27a0067d
      https://github.com/ioquake/ioq3/commit/76e49b668efe7a16b66635e42187194d27a0067d
  Author: Tim Angus <tim at ngus.net>
  Date:   2013-09-16 (Mon, 16 Sep 2013)

  Changed paths:
    M code/cgame/cg_consolecmds.c
    M code/cgame/cg_players.c
    M code/game/g_bot.c
    M code/q3_ui/ui_players.c
    M code/renderercommon/qgl.h
    M code/renderergl1/tr_image.c
    M code/renderergl2/glsl/generic_fp.glsl
    M code/renderergl2/glsl/lightall_fp.glsl
    M code/renderergl2/glsl/lightall_vp.glsl
    M code/renderergl2/tr_animation.c
    M code/renderergl2/tr_backend.c
    M code/renderergl2/tr_bsp.c
    M code/renderergl2/tr_extensions.c
    M code/renderergl2/tr_fbo.c
    M code/renderergl2/tr_flares.c
    M code/renderergl2/tr_glsl.c
    M code/renderergl2/tr_image.c
    M code/renderergl2/tr_init.c
    M code/renderergl2/tr_light.c
    M code/renderergl2/tr_local.h
    M code/renderergl2/tr_main.c
    M code/renderergl2/tr_mesh.c
    M code/renderergl2/tr_model_iqm.c
    M code/renderergl2/tr_scene.c
    M code/renderergl2/tr_shade.c
    M code/renderergl2/tr_shader.c
    M code/renderergl2/tr_sky.c
    M code/renderergl2/tr_surface.c
    M code/renderergl2/tr_world.c
    M code/sys/sys_unix.c
    M code/ui/ui_players.c

  Log Message:
  -----------
  Merge branch 'master' into sdl2


  Commit: 1ec9f8d1a82122abbc00568659e7de5ed11a8e79
      https://github.com/ioquake/ioq3/commit/1ec9f8d1a82122abbc00568659e7de5ed11a8e79
  Author: Zack Middleton <zturtleman at gmail.com>
  Date:   2013-09-21 (Sat, 21 Sep 2013)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Fix building sdl2 branch on travis-ci

Install libsdl2-dev from a PPA.


  Commit: d7444b8ca161cd4c3d50493f80f1bcaaeb441ecd
      https://github.com/ioquake/ioq3/commit/d7444b8ca161cd4c3d50493f80f1bcaaeb441ecd
  Author: cmf028 <cmf1292 at hotmail.com>
  Date:   2013-09-23 (Mon, 23 Sep 2013)

  Changed paths:
    M code/sdl/sdl_glimp.c

  Log Message:
  -----------
  Don't set the window title twice


  Commit: 7d83bba2d02973528eaecf5f3464c2bbe9728487
      https://github.com/ioquake/ioq3/commit/7d83bba2d02973528eaecf5f3464c2bbe9728487
  Author: cmf028 <cmf1292 at hotmail.com>
  Date:   2013-09-23 (Mon, 23 Sep 2013)

  Changed paths:
    M code/sdl/sdl_input.c

  Log Message:
  -----------
  Set com_minimized to 0 when the window is restored


  Commit: 11c3bed74d0c2a0316302803b15176fe0f22e1a3
      https://github.com/ioquake/ioq3/commit/11c3bed74d0c2a0316302803b15176fe0f22e1a3
  Author: cmf028 <cmf1292 at hotmail.com>
  Date:   2013-09-23 (Mon, 23 Sep 2013)

  Changed paths:
    M code/sdl/sdl_input.c

  Log Message:
  -----------
  Send key up events for the mouse wheel

Previous versions of SDL would send SDL_MOUSEBUTTONUP events for the mouse wheel immediately following the corresponding SDL_MOUSEBUTTONDOWN event


  Commit: 6831db0563c27a8ccc17cc4e591d48f4e11c1493
      https://github.com/ioquake/ioq3/commit/6831db0563c27a8ccc17cc4e591d48f4e11c1493
  Author: Tim Angus <tim at ngus.net>
  Date:   2013-09-30 (Mon, 30 Sep 2013)

  Changed paths:
    M code/sdl/sdl_glimp.c
    M code/sdl/sdl_input.c

  Log Message:
  -----------
  Merge pull request #16 from cmf028/sdl2

SDL2 fixes


  Commit: c6a61d212a0bb7b56e53ea3802d2244309577c05
      https://github.com/ioquake/ioq3/commit/c6a61d212a0bb7b56e53ea3802d2244309577c05
  Author: Zack Middleton <zturtleman at gmail.com>
  Date:   2013-10-18 (Fri, 18 Oct 2013)

  Changed paths:
    M code/sdl/sdl_input.c

  Log Message:
  -----------
  Fix SDL2 losing event subsystem

Quiting SDL Video or Joystick subsystem implies quiting the Event subsystem in SDL2.
SDL keeps track of number of init and shutdown calls for each subsystem.
Shuting down video or joystick more or equal to number of times they're inited will lead to event shutdown.

Toggling in and out of fullscreen or running in_restart twice causes SDL event subsystem to shutdown, making input not work.

If the console is closed, IN_GobbleMotionEvents gets stuck in a loop. SDL_PeepEvents returns -1 when there is an error, but we assume non-0 means read more events.

IN_ShutdownJoystick needs to check if joystick subsystem was inited before quitting it, otherwise we may cause SDL event subsystem to shutdown.


  Commit: cb153f2aaa3547d03d515c24d2992dc0dad4b1ad
      https://github.com/ioquake/ioq3/commit/cb153f2aaa3547d03d515c24d2992dc0dad4b1ad
  Author: Zack Middleton <zturtleman at gmail.com>
  Date:   2013-10-19 (Sat, 19 Oct 2013)

  Changed paths:
    M code/sdl/sdl_input.c

  Log Message:
  -----------
  Fix warning that SDL_GetKeyboardState return value is used non-const


  Commit: 983ebbb4a67d577be3c2dca194880524a3503e9b
      https://github.com/ioquake/ioq3/commit/983ebbb4a67d577be3c2dca194880524a3503e9b
  Author: Zack Middleton <zturtleman at gmail.com>
  Date:   2013-10-19 (Sat, 19 Oct 2013)

  Changed paths:
    M code/sys/sys_main.c

  Log Message:
  -----------
  Ignore -psn* arguments on Mac OS X

Mac OS X adds an argument starting with "-psn" when launched using Finder, Dock,
or a terminal using open command and not specifying arguments.

It caused the opening videos to be skipped.

This change mimics SDL 1.2.


  Commit: 8c1d3c635c50047d19b178a18a3264e8fca1f0b6
      https://github.com/ioquake/ioq3/commit/8c1d3c635c50047d19b178a18a3264e8fca1f0b6
  Author: Zack Middleton <zturtleman at gmail.com>
  Date:   2013-10-19 (Sat, 19 Oct 2013)

  Changed paths:
    M code/sdl/sdl_glimp.c

  Log Message:
  -----------
  Use bundle icon on Mac OS X instead of internal 32x32 window icon


  Commit: 5fdff01d1bcd400d6fe319f466f8ec30d1624830
      https://github.com/ioquake/ioq3/commit/5fdff01d1bcd400d6fe319f466f8ec30d1624830
  Author: Zack Middleton <zturtleman at gmail.com>
  Date:   2013-10-20 (Sun, 20 Oct 2013)

  Changed paths:
    M code/sys/sys_main.c

  Log Message:
  -----------
  Check #ifdef MACOS_X not #if MACOS_X


  Commit: 779ebfacfd3fd7ee19d39ed85036b4b1efeb6d47
      https://github.com/ioquake/ioq3/commit/779ebfacfd3fd7ee19d39ed85036b4b1efeb6d47
  Author: Tim Angus <tim at ngus.net>
  Date:   2013-11-02 (Sat, 02 Nov 2013)

  Changed paths:
    M code/client/cl_main.c
    M code/client/client.h
    M code/client/snd_dma.c
    M code/client/snd_mem.c
    M code/client/snd_openal.c
    M code/renderergl1/tr_init.c
    M code/renderergl1/tr_local.h
    M code/renderergl1/tr_model_iqm.c
    M code/renderergl1/tr_shade.c
    M code/renderergl2/glsl/fogpass_vp.glsl
    M code/renderergl2/glsl/generic_vp.glsl
    M code/renderergl2/glsl/lightall_fp.glsl
    M code/renderergl2/glsl/lightall_vp.glsl
    M code/renderergl2/tr_bsp.c
    M code/renderergl2/tr_curve.c
    M code/renderergl2/tr_extensions.c
    M code/renderergl2/tr_glsl.c
    M code/renderergl2/tr_image.c
    M code/renderergl2/tr_init.c
    M code/renderergl2/tr_light.c
    M code/renderergl2/tr_local.h
    M code/renderergl2/tr_main.c
    M code/renderergl2/tr_marks.c
    M code/renderergl2/tr_model.c
    M code/renderergl2/tr_model_iqm.c
    M code/renderergl2/tr_shade.c
    M code/renderergl2/tr_shade_calc.c
    M code/renderergl2/tr_shader.c
    M code/renderergl2/tr_surface.c
    M code/renderergl2/tr_vbo.c
    M code/renderergl2/tr_world.c
    M code/ui/ui_main.c

  Log Message:
  -----------
  Merge branch 'master' into sdl2


  Commit: 3736968943b3339d9f161044971d3c38b19f5c04
      https://github.com/ioquake/ioq3/commit/3736968943b3339d9f161044971d3c38b19f5c04
  Author: Zack Middleton <zturtleman at gmail.com>
  Date:   2013-11-17 (Sun, 17 Nov 2013)

  Changed paths:
    M code/client/cl_main.c
    M code/client/snd_codec_ogg.c
    M code/client/snd_codec_opus.c
    M code/client/snd_openal.c
    M code/qcommon/files.c
    M code/qcommon/q_shared.c
    M code/qcommon/qcommon.h
    M code/renderergl1/tr_flares.c
    M code/renderergl2/glsl/generic_vp.glsl
    M code/renderergl2/glsl/lightall_fp.glsl
    M code/renderergl2/glsl/lightall_vp.glsl
    M code/renderergl2/tr_animation.c
    M code/renderergl2/tr_backend.c
    M code/renderergl2/tr_bsp.c
    M code/renderergl2/tr_cmds.c
    M code/renderergl2/tr_curve.c
    M code/renderergl2/tr_fbo.c
    M code/renderergl2/tr_flares.c
    M code/renderergl2/tr_glsl.c
    M code/renderergl2/tr_image.c
    M code/renderergl2/tr_local.h
    M code/renderergl2/tr_main.c
    M code/renderergl2/tr_marks.c
    M code/renderergl2/tr_model.c
    M code/renderergl2/tr_model_iqm.c
    M code/renderergl2/tr_postprocess.c
    M code/renderergl2/tr_shade.c
    M code/renderergl2/tr_shade_calc.c
    M code/renderergl2/tr_shader.c
    M code/renderergl2/tr_sky.c
    M code/renderergl2/tr_surface.c
    M code/renderergl2/tr_vbo.c

  Log Message:
  -----------
  Merge branch 'master' into sdl2


  Commit: ad514c9689d6d3e21e8244be390a66b068a19d6b
      https://github.com/ioquake/ioq3/commit/ad514c9689d6d3e21e8244be390a66b068a19d6b
  Author: Zack Middleton <zturtleman at gmail.com>
  Date:   2013-11-26 (Tue, 26 Nov 2013)

  Changed paths:
    R README
    A README.md
    M code/client/snd_dma.c
    M code/game/g_client.c
    M code/game/g_combat.c
    M code/renderergl1/tr_backend.c
    M code/renderergl2/tr_backend.c
    M code/renderergl2/tr_extramath.c
    M code/renderergl2/tr_extramath.h
    M code/renderergl2/tr_fbo.c
    M code/renderergl2/tr_fbo.h
    M code/renderergl2/tr_flares.c
    M code/renderergl2/tr_glsl.c
    M code/renderergl2/tr_image.c
    M code/renderergl2/tr_local.h
    M code/renderergl2/tr_main.c
    M code/renderergl2/tr_postprocess.c
    M code/renderergl2/tr_postprocess.h
    M code/renderergl2/tr_shade.c
    M code/renderergl2/tr_sky.c
    M code/renderergl2/tr_surface.c

  Log Message:
  -----------
  Merge branch 'master' into sdl2


  Commit: 952fd0489c4466051cd4c343bbd9c93cfdc5cd4c
      https://github.com/ioquake/ioq3/commit/952fd0489c4466051cd4c343bbd9c93cfdc5cd4c
  Author: Zack Middleton <zturtleman at gmail.com>
  Date:   2013-11-26 (Tue, 26 Nov 2013)

  Changed paths:
    M code/client/cl_keys.c
    M code/sdl/sdl_input.c

  Log Message:
  -----------
  Readd backspace char event for UI VM text fields

UI VMs expect a backspace char event, but sdl2 branch only was only sending a key event.
Revert cl_keys.c to master branch (it would cause backspace to happen twice in console).


  Commit: ed087bb89eb4153966e4b292ebabe493b6618ecd
      https://github.com/ioquake/ioq3/commit/ed087bb89eb4153966e4b292ebabe493b6618ecd
  Author: Zack Middleton <zturtleman at gmail.com>
  Date:   2014-02-07 (Fri, 07 Feb 2014)

  Changed paths:
    M Makefile
    M README.md
    M code/client/cl_cin.c
    M code/client/cl_main.c
    M code/client/cl_parse.c
    M code/client/cl_scrn.c
    M code/client/snd_dma.c
    M code/client/snd_local.h
    M code/client/snd_mem.c
    M code/client/snd_mix.c
    M code/client/snd_openal.c
    R code/libogg-1.3.0/include/ogg/config_types.h
    R code/libogg-1.3.0/include/ogg/ogg.h
    R code/libogg-1.3.0/include/ogg/ogg.h
    R code/libogg-1.3.0/include/ogg/os_types.h
    R code/libogg-1.3.0/include/ogg/os_types.h
    R code/libogg-1.3.0/src/bitwise.c
    R code/libogg-1.3.0/src/bitwise.c
    R code/libogg-1.3.0/src/framing.c
    A code/libogg-1.3.1/include/ogg/config_types.h
    A code/libogg-1.3.1/include/ogg/ogg.h
    A code/libogg-1.3.1/include/ogg/ogg.h
    A code/libogg-1.3.1/include/ogg/os_types.h
    A code/libogg-1.3.1/include/ogg/os_types.h
    A code/libogg-1.3.1/src/bitwise.c
    A code/libogg-1.3.1/src/bitwise.c
    A code/libogg-1.3.1/src/framing.c
    R code/opus-1.0.2/celt/_kiss_fft_guts.h
    R code/opus-1.0.2/celt/arch.h
    R code/opus-1.0.2/celt/bands.c
    R code/opus-1.0.2/celt/bands.h
    R code/opus-1.0.2/celt/celt.c
    R code/opus-1.0.2/celt/celt.h
    R code/opus-1.0.2/celt/celt_lpc.c
    R code/opus-1.0.2/celt/celt_lpc.h
    R code/opus-1.0.2/celt/cwrs.c
    R code/opus-1.0.2/celt/cwrs.h
    R code/opus-1.0.2/celt/cwrs.h
    R code/opus-1.0.2/celt/ecintrin.h
    R code/opus-1.0.2/celt/entcode.c
    R code/opus-1.0.2/celt/entcode.c
    R code/opus-1.0.2/celt/entcode.h
    R code/opus-1.0.2/celt/entdec.c
    R code/opus-1.0.2/celt/entdec.h
    R code/opus-1.0.2/celt/entdec.h
    R code/opus-1.0.2/celt/entenc.c
    R code/opus-1.0.2/celt/entenc.c
    R code/opus-1.0.2/celt/entenc.h
    R code/opus-1.0.2/celt/entenc.h
    R code/opus-1.0.2/celt/fixed_debug.h
    R code/opus-1.0.2/celt/fixed_generic.h
    R code/opus-1.0.2/celt/float_cast.h
    R code/opus-1.0.2/celt/kiss_fft.c
    R code/opus-1.0.2/celt/kiss_fft.h
    R code/opus-1.0.2/celt/kiss_fft.h
    R code/opus-1.0.2/celt/laplace.c
    R code/opus-1.0.2/celt/laplace.c
    R code/opus-1.0.2/celt/laplace.h
    R code/opus-1.0.2/celt/laplace.h
    R code/opus-1.0.2/celt/mathops.c
    R code/opus-1.0.2/celt/mathops.h
    R code/opus-1.0.2/celt/mdct.c
    R code/opus-1.0.2/celt/mdct.h
    R code/opus-1.0.2/celt/mdct.h
    R code/opus-1.0.2/celt/mfrngcod.h
    R code/opus-1.0.2/celt/mfrngcod.h
    R code/opus-1.0.2/celt/modes.c
    R code/opus-1.0.2/celt/modes.h
    R code/opus-1.0.2/celt/modes.h
    R code/opus-1.0.2/celt/opus_custom_demo.c
    R code/opus-1.0.2/celt/opus_custom_demo.c
    R code/opus-1.0.2/celt/os_support.h
    R code/opus-1.0.2/celt/pitch.c
    R code/opus-1.0.2/celt/pitch.h
    R code/opus-1.0.2/celt/quant_bands.c
    R code/opus-1.0.2/celt/quant_bands.h
    R code/opus-1.0.2/celt/rate.c
    R code/opus-1.0.2/celt/rate.h
    R code/opus-1.0.2/celt/stack_alloc.h
    R code/opus-1.0.2/celt/static_modes_fixed.h
    R code/opus-1.0.2/celt/static_modes_fixed.h
    R code/opus-1.0.2/celt/static_modes_float.h
    R code/opus-1.0.2/celt/static_modes_float.h
    R code/opus-1.0.2/celt/vq.c
    R code/opus-1.0.2/celt/vq.c
    R code/opus-1.0.2/celt/vq.h
    R code/opus-1.0.2/include/opus.h
    R code/opus-1.0.2/include/opus_custom.h
    R code/opus-1.0.2/include/opus_defines.h
    R code/opus-1.0.2/include/opus_multistream.h
    R code/opus-1.0.2/include/opus_types.h
    R code/opus-1.0.2/include/opus_types.h
    R code/opus-1.0.2/silk/A2NLSF.c
    R code/opus-1.0.2/silk/API.h
    R code/opus-1.0.2/silk/CNG.c
    R code/opus-1.0.2/silk/HP_variable_cutoff.c
    R code/opus-1.0.2/silk/Inlines.h
    R code/opus-1.0.2/silk/LPC_analysis_filter.c
    R code/opus-1.0.2/silk/LPC_inv_pred_gain.c
    R code/opus-1.0.2/silk/LP_variable_cutoff.c
    R code/opus-1.0.2/silk/MacroCount.h
    R code/opus-1.0.2/silk/MacroDebug.h
    R code/opus-1.0.2/silk/NLSF2A.c
    R code/opus-1.0.2/silk/NLSF_VQ.c
    R code/opus-1.0.2/silk/NLSF_VQ_weights_laroia.c
    R code/opus-1.0.2/silk/NLSF_decode.c
    R code/opus-1.0.2/silk/NLSF_del_dec_quant.c
    R code/opus-1.0.2/silk/NLSF_encode.c
    R code/opus-1.0.2/silk/NLSF_stabilize.c
    R code/opus-1.0.2/silk/NLSF_unpack.c
    R code/opus-1.0.2/silk/NSQ.c
    R code/opus-1.0.2/silk/NSQ_del_dec.c
    R code/opus-1.0.2/silk/PLC.c
    R code/opus-1.0.2/silk/PLC.h
    R code/opus-1.0.2/silk/SigProc_FIX.h
    R code/opus-1.0.2/silk/VAD.c
    R code/opus-1.0.2/silk/VQ_WMat_EC.c
    R code/opus-1.0.2/silk/ana_filt_bank_1.c
    R code/opus-1.0.2/silk/biquad_alt.c
    R code/opus-1.0.2/silk/bwexpander.c
    R code/opus-1.0.2/silk/bwexpander_32.c
    R code/opus-1.0.2/silk/check_control_input.c
    R code/opus-1.0.2/silk/code_signs.c
    R code/opus-1.0.2/silk/control.h
    R code/opus-1.0.2/silk/control_SNR.c
    R code/opus-1.0.2/silk/control_audio_bandwidth.c
    R code/opus-1.0.2/silk/control_codec.c
    R code/opus-1.0.2/silk/debug.c
    R code/opus-1.0.2/silk/debug.h
    R code/opus-1.0.2/silk/dec_API.c
    R code/opus-1.0.2/silk/decode_core.c
    R code/opus-1.0.2/silk/decode_frame.c
    R code/opus-1.0.2/silk/decode_indices.c
    R code/opus-1.0.2/silk/decode_parameters.c
    R code/opus-1.0.2/silk/decode_pitch.c
    R code/opus-1.0.2/silk/decode_pulses.c
    R code/opus-1.0.2/silk/decoder_set_fs.c
    R code/opus-1.0.2/silk/define.h
    R code/opus-1.0.2/silk/enc_API.c
    R code/opus-1.0.2/silk/encode_indices.c
    R code/opus-1.0.2/silk/encode_pulses.c
    R code/opus-1.0.2/silk/errors.h
    R code/opus-1.0.2/silk/fixed/LTP_analysis_filter_FIX.c
    R code/opus-1.0.2/silk/fixed/LTP_scale_ctrl_FIX.c
    R code/opus-1.0.2/silk/fixed/apply_sine_window_FIX.c
    R code/opus-1.0.2/silk/fixed/autocorr_FIX.c
    R code/opus-1.0.2/silk/fixed/burg_modified_FIX.c
    R code/opus-1.0.2/silk/fixed/corrMatrix_FIX.c
    R code/opus-1.0.2/silk/fixed/encode_frame_FIX.c
    R code/opus-1.0.2/silk/fixed/find_LPC_FIX.c
    R code/opus-1.0.2/silk/fixed/find_LTP_FIX.c
    R code/opus-1.0.2/silk/fixed/find_pitch_lags_FIX.c
    R code/opus-1.0.2/silk/fixed/find_pred_coefs_FIX.c
    R code/opus-1.0.2/silk/fixed/k2a_FIX.c
    R code/opus-1.0.2/silk/fixed/k2a_Q16_FIX.c
    R code/opus-1.0.2/silk/fixed/main_FIX.h
    R code/opus-1.0.2/silk/fixed/noise_shape_analysis_FIX.c
    R code/opus-1.0.2/silk/fixed/pitch_analysis_core_FIX.c
    R code/opus-1.0.2/silk/fixed/prefilter_FIX.c
    R code/opus-1.0.2/silk/fixed/process_gains_FIX.c
    R code/opus-1.0.2/silk/fixed/regularize_correlations_FIX.c
    R code/opus-1.0.2/silk/fixed/residual_energy16_FIX.c
    R code/opus-1.0.2/silk/fixed/residual_energy_FIX.c
    R code/opus-1.0.2/silk/fixed/schur64_FIX.c
    R code/opus-1.0.2/silk/fixed/schur_FIX.c
    R code/opus-1.0.2/silk/fixed/solve_LS_FIX.c
    R code/opus-1.0.2/silk/fixed/structs_FIX.h
    R code/opus-1.0.2/silk/fixed/vector_ops_FIX.c
    R code/opus-1.0.2/silk/fixed/warped_autocorrelation_FIX.c
    R code/opus-1.0.2/silk/float/LPC_analysis_filter_FLP.c
    R code/opus-1.0.2/silk/float/LPC_inv_pred_gain_FLP.c
    R code/opus-1.0.2/silk/float/LTP_analysis_filter_FLP.c
    R code/opus-1.0.2/silk/float/LTP_scale_ctrl_FLP.c
    R code/opus-1.0.2/silk/float/SigProc_FLP.h
    R code/opus-1.0.2/silk/float/apply_sine_window_FLP.c
    R code/opus-1.0.2/silk/float/autocorrelation_FLP.c
    R code/opus-1.0.2/silk/float/burg_modified_FLP.c
    R code/opus-1.0.2/silk/float/bwexpander_FLP.c
    R code/opus-1.0.2/silk/float/corrMatrix_FLP.c
    R code/opus-1.0.2/silk/float/encode_frame_FLP.c
    R code/opus-1.0.2/silk/float/energy_FLP.c
    R code/opus-1.0.2/silk/float/find_LPC_FLP.c
    R code/opus-1.0.2/silk/float/find_LTP_FLP.c
    R code/opus-1.0.2/silk/float/find_pitch_lags_FLP.c
    R code/opus-1.0.2/silk/float/find_pred_coefs_FLP.c
    R code/opus-1.0.2/silk/float/inner_product_FLP.c
    R code/opus-1.0.2/silk/float/k2a_FLP.c
    R code/opus-1.0.2/silk/float/levinsondurbin_FLP.c
    R code/opus-1.0.2/silk/float/main_FLP.h
    R code/opus-1.0.2/silk/float/noise_shape_analysis_FLP.c
    R code/opus-1.0.2/silk/float/pitch_analysis_core_FLP.c
    R code/opus-1.0.2/silk/float/prefilter_FLP.c
    R code/opus-1.0.2/silk/float/process_gains_FLP.c
    R code/opus-1.0.2/silk/float/regularize_correlations_FLP.c
    R code/opus-1.0.2/silk/float/residual_energy_FLP.c
    R code/opus-1.0.2/silk/float/scale_copy_vector_FLP.c
    R code/opus-1.0.2/silk/float/scale_vector_FLP.c
    R code/opus-1.0.2/silk/float/schur_FLP.c
    R code/opus-1.0.2/silk/float/solve_LS_FLP.c
    R code/opus-1.0.2/silk/float/sort_FLP.c
    R code/opus-1.0.2/silk/float/structs_FLP.h
    R code/opus-1.0.2/silk/float/warped_autocorrelation_FLP.c
    R code/opus-1.0.2/silk/float/wrappers_FLP.c
    R code/opus-1.0.2/silk/gain_quant.c
    R code/opus-1.0.2/silk/init_decoder.c
    R code/opus-1.0.2/silk/init_encoder.c
    R code/opus-1.0.2/silk/inner_prod_aligned.c
    R code/opus-1.0.2/silk/interpolate.c
    R code/opus-1.0.2/silk/lin2log.c
    R code/opus-1.0.2/silk/log2lin.c
    R code/opus-1.0.2/silk/macros.h
    R code/opus-1.0.2/silk/main.h
    R code/opus-1.0.2/silk/pitch_est_defines.h
    R code/opus-1.0.2/silk/pitch_est_tables.c
    R code/opus-1.0.2/silk/process_NLSFs.c
    R code/opus-1.0.2/silk/quant_LTP_gains.c
    R code/opus-1.0.2/silk/resampler.c
    R code/opus-1.0.2/silk/resampler_down2.c
    R code/opus-1.0.2/silk/resampler_down2_3.c
    R code/opus-1.0.2/silk/resampler_private.h
    R code/opus-1.0.2/silk/resampler_private_AR2.c
    R code/opus-1.0.2/silk/resampler_private_IIR_FIR.c
    R code/opus-1.0.2/silk/resampler_private_down_FIR.c
    R code/opus-1.0.2/silk/resampler_private_up2_HQ.c
    R code/opus-1.0.2/silk/resampler_rom.c
    R code/opus-1.0.2/silk/resampler_rom.h
    R code/opus-1.0.2/silk/resampler_structs.h
    R code/opus-1.0.2/silk/shell_coder.c
    R code/opus-1.0.2/silk/sigm_Q15.c
    R code/opus-1.0.2/silk/sort.c
    R code/opus-1.0.2/silk/stereo_LR_to_MS.c
    R code/opus-1.0.2/silk/stereo_MS_to_LR.c
    R code/opus-1.0.2/silk/stereo_decode_pred.c
    R code/opus-1.0.2/silk/stereo_encode_pred.c
    R code/opus-1.0.2/silk/stereo_find_predictor.c
    R code/opus-1.0.2/silk/stereo_quant_pred.c
    R code/opus-1.0.2/silk/structs.h
    R code/opus-1.0.2/silk/sum_sqr_shift.c
    R code/opus-1.0.2/silk/table_LSF_cos.c
    R code/opus-1.0.2/silk/tables.h
    R code/opus-1.0.2/silk/tables_LTP.c
    R code/opus-1.0.2/silk/tables_NLSF_CB_NB_MB.c
    R code/opus-1.0.2/silk/tables_NLSF_CB_WB.c
    R code/opus-1.0.2/silk/tables_gain.c
    R code/opus-1.0.2/silk/tables_other.c
    R code/opus-1.0.2/silk/tables_pitch_lag.c
    R code/opus-1.0.2/silk/tables_pulses_per_block.c
    R code/opus-1.0.2/silk/tuning_parameters.h
    R code/opus-1.0.2/silk/typedef.h
    R code/opus-1.0.2/src/opus.c
    R code/opus-1.0.2/src/opus_decoder.c
    R code/opus-1.0.2/src/opus_encoder.c
    R code/opus-1.0.2/src/opus_multistream.c
    R code/opus-1.0.2/src/opus_private.h
    R code/opus-1.0.2/src/repacketizer.c
    A code/opus-1.1/celt/_kiss_fft_guts.h
    A code/opus-1.1/celt/arch.h
    A code/opus-1.1/celt/arm/arm2gnu.pl
    A code/opus-1.1/celt/arm/arm_celt_map.c
    A code/opus-1.1/celt/arm/armcpu.c
    A code/opus-1.1/celt/arm/armcpu.h
    A code/opus-1.1/celt/arm/armopts.s.in
    A code/opus-1.1/celt/arm/celt_pitch_xcorr_arm.s
    A code/opus-1.1/celt/arm/fixed_armv4.h
    A code/opus-1.1/celt/arm/fixed_armv5e.h
    A code/opus-1.1/celt/arm/kiss_fft_armv4.h
    A code/opus-1.1/celt/arm/kiss_fft_armv5e.h
    A code/opus-1.1/celt/arm/pitch_arm.h
    A code/opus-1.1/celt/bands.c
    A code/opus-1.1/celt/bands.h
    A code/opus-1.1/celt/celt.c
    A code/opus-1.1/celt/celt.h
    A code/opus-1.1/celt/celt_decoder.c
    A code/opus-1.1/celt/celt_encoder.c
    A code/opus-1.1/celt/celt_lpc.c
    A code/opus-1.1/celt/celt_lpc.h
    A code/opus-1.1/celt/cpu_support.h
    A code/opus-1.1/celt/cwrs.c
    A code/opus-1.1/celt/cwrs.h
    A code/opus-1.1/celt/cwrs.h
    A code/opus-1.1/celt/ecintrin.h
    A code/opus-1.1/celt/entcode.c
    A code/opus-1.1/celt/entcode.c
    A code/opus-1.1/celt/entcode.h
    A code/opus-1.1/celt/entdec.c
    A code/opus-1.1/celt/entdec.h
    A code/opus-1.1/celt/entdec.h
    A code/opus-1.1/celt/entenc.c
    A code/opus-1.1/celt/entenc.c
    A code/opus-1.1/celt/entenc.h
    A code/opus-1.1/celt/entenc.h
    A code/opus-1.1/celt/fixed_debug.h
    A code/opus-1.1/celt/fixed_generic.h
    A code/opus-1.1/celt/float_cast.h
    A code/opus-1.1/celt/kiss_fft.c
    A code/opus-1.1/celt/kiss_fft.h
    A code/opus-1.1/celt/kiss_fft.h
    A code/opus-1.1/celt/laplace.c
    A code/opus-1.1/celt/laplace.c
    A code/opus-1.1/celt/laplace.h
    A code/opus-1.1/celt/laplace.h
    A code/opus-1.1/celt/mathops.c
    A code/opus-1.1/celt/mathops.h
    A code/opus-1.1/celt/mdct.c
    A code/opus-1.1/celt/mdct.h
    A code/opus-1.1/celt/mdct.h
    A code/opus-1.1/celt/mfrngcod.h
    A code/opus-1.1/celt/mfrngcod.h
    A code/opus-1.1/celt/modes.c
    A code/opus-1.1/celt/modes.h
    A code/opus-1.1/celt/modes.h
    A code/opus-1.1/celt/opus_custom_demo.c
    A code/opus-1.1/celt/opus_custom_demo.c
    A code/opus-1.1/celt/os_support.h
    A code/opus-1.1/celt/pitch.c
    A code/opus-1.1/celt/pitch.h
    A code/opus-1.1/celt/quant_bands.c
    A code/opus-1.1/celt/quant_bands.h
    A code/opus-1.1/celt/rate.c
    A code/opus-1.1/celt/rate.h
    A code/opus-1.1/celt/stack_alloc.h
    A code/opus-1.1/celt/static_modes_fixed.h
    A code/opus-1.1/celt/static_modes_fixed.h
    A code/opus-1.1/celt/static_modes_float.h
    A code/opus-1.1/celt/static_modes_float.h
    A code/opus-1.1/celt/vq.c
    A code/opus-1.1/celt/vq.c
    A code/opus-1.1/celt/vq.h
    A code/opus-1.1/celt/x86/pitch_sse.h
    A code/opus-1.1/include/opus.h
    A code/opus-1.1/include/opus_custom.h
    A code/opus-1.1/include/opus_defines.h
    A code/opus-1.1/include/opus_multistream.h
    A code/opus-1.1/include/opus_types.h
    A code/opus-1.1/include/opus_types.h
    A code/opus-1.1/silk/A2NLSF.c
    A code/opus-1.1/silk/API.h
    A code/opus-1.1/silk/CNG.c
    A code/opus-1.1/silk/HP_variable_cutoff.c
    A code/opus-1.1/silk/Inlines.h
    A code/opus-1.1/silk/LPC_analysis_filter.c
    A code/opus-1.1/silk/LPC_inv_pred_gain.c
    A code/opus-1.1/silk/LP_variable_cutoff.c
    A code/opus-1.1/silk/MacroCount.h
    A code/opus-1.1/silk/MacroDebug.h
    A code/opus-1.1/silk/NLSF2A.c
    A code/opus-1.1/silk/NLSF_VQ.c
    A code/opus-1.1/silk/NLSF_VQ_weights_laroia.c
    A code/opus-1.1/silk/NLSF_decode.c
    A code/opus-1.1/silk/NLSF_del_dec_quant.c
    A code/opus-1.1/silk/NLSF_encode.c
    A code/opus-1.1/silk/NLSF_stabilize.c
    A code/opus-1.1/silk/NLSF_unpack.c
    A code/opus-1.1/silk/NSQ.c
    A code/opus-1.1/silk/NSQ_del_dec.c
    A code/opus-1.1/silk/PLC.c
    A code/opus-1.1/silk/PLC.h
    A code/opus-1.1/silk/SigProc_FIX.h
    A code/opus-1.1/silk/VAD.c
    A code/opus-1.1/silk/VQ_WMat_EC.c
    A code/opus-1.1/silk/ana_filt_bank_1.c
    A code/opus-1.1/silk/arm/SigProc_FIX_armv4.h
    A code/opus-1.1/silk/arm/SigProc_FIX_armv5e.h
    A code/opus-1.1/silk/arm/macros_armv4.h
    A code/opus-1.1/silk/arm/macros_armv5e.h
    A code/opus-1.1/silk/biquad_alt.c
    A code/opus-1.1/silk/bwexpander.c
    A code/opus-1.1/silk/bwexpander_32.c
    A code/opus-1.1/silk/check_control_input.c
    A code/opus-1.1/silk/code_signs.c
    A code/opus-1.1/silk/control.h
    A code/opus-1.1/silk/control_SNR.c
    A code/opus-1.1/silk/control_audio_bandwidth.c
    A code/opus-1.1/silk/control_codec.c
    A code/opus-1.1/silk/debug.c
    A code/opus-1.1/silk/debug.h
    A code/opus-1.1/silk/dec_API.c
    A code/opus-1.1/silk/decode_core.c
    A code/opus-1.1/silk/decode_frame.c
    A code/opus-1.1/silk/decode_indices.c
    A code/opus-1.1/silk/decode_parameters.c
    A code/opus-1.1/silk/decode_pitch.c
    A code/opus-1.1/silk/decode_pulses.c
    A code/opus-1.1/silk/decoder_set_fs.c
    A code/opus-1.1/silk/define.h
    A code/opus-1.1/silk/enc_API.c
    A code/opus-1.1/silk/encode_indices.c
    A code/opus-1.1/silk/encode_pulses.c
    A code/opus-1.1/silk/errors.h
    A code/opus-1.1/silk/fixed/LTP_analysis_filter_FIX.c
    A code/opus-1.1/silk/fixed/LTP_scale_ctrl_FIX.c
    A code/opus-1.1/silk/fixed/apply_sine_window_FIX.c
    A code/opus-1.1/silk/fixed/autocorr_FIX.c
    A code/opus-1.1/silk/fixed/burg_modified_FIX.c
    A code/opus-1.1/silk/fixed/corrMatrix_FIX.c
    A code/opus-1.1/silk/fixed/encode_frame_FIX.c
    A code/opus-1.1/silk/fixed/find_LPC_FIX.c
    A code/opus-1.1/silk/fixed/find_LTP_FIX.c
    A code/opus-1.1/silk/fixed/find_pitch_lags_FIX.c
    A code/opus-1.1/silk/fixed/find_pred_coefs_FIX.c
    A code/opus-1.1/silk/fixed/k2a_FIX.c
    A code/opus-1.1/silk/fixed/k2a_Q16_FIX.c
    A code/opus-1.1/silk/fixed/main_FIX.h
    A code/opus-1.1/silk/fixed/noise_shape_analysis_FIX.c
    A code/opus-1.1/silk/fixed/pitch_analysis_core_FIX.c
    A code/opus-1.1/silk/fixed/prefilter_FIX.c
    A code/opus-1.1/silk/fixed/process_gains_FIX.c
    A code/opus-1.1/silk/fixed/regularize_correlations_FIX.c
    A code/opus-1.1/silk/fixed/residual_energy16_FIX.c
    A code/opus-1.1/silk/fixed/residual_energy_FIX.c
    A code/opus-1.1/silk/fixed/schur64_FIX.c
    A code/opus-1.1/silk/fixed/schur_FIX.c
    A code/opus-1.1/silk/fixed/solve_LS_FIX.c
    A code/opus-1.1/silk/fixed/structs_FIX.h
    A code/opus-1.1/silk/fixed/vector_ops_FIX.c
    A code/opus-1.1/silk/fixed/warped_autocorrelation_FIX.c
    A code/opus-1.1/silk/float/LPC_analysis_filter_FLP.c
    A code/opus-1.1/silk/float/LPC_inv_pred_gain_FLP.c
    A code/opus-1.1/silk/float/LTP_analysis_filter_FLP.c
    A code/opus-1.1/silk/float/LTP_scale_ctrl_FLP.c
    A code/opus-1.1/silk/float/SigProc_FLP.h
    A code/opus-1.1/silk/float/apply_sine_window_FLP.c
    A code/opus-1.1/silk/float/autocorrelation_FLP.c
    A code/opus-1.1/silk/float/burg_modified_FLP.c
    A code/opus-1.1/silk/float/bwexpander_FLP.c
    A code/opus-1.1/silk/float/corrMatrix_FLP.c
    A code/opus-1.1/silk/float/encode_frame_FLP.c
    A code/opus-1.1/silk/float/energy_FLP.c
    A code/opus-1.1/silk/float/find_LPC_FLP.c
    A code/opus-1.1/silk/float/find_LTP_FLP.c
    A code/opus-1.1/silk/float/find_pitch_lags_FLP.c
    A code/opus-1.1/silk/float/find_pred_coefs_FLP.c
    A code/opus-1.1/silk/float/inner_product_FLP.c
    A code/opus-1.1/silk/float/k2a_FLP.c
    A code/opus-1.1/silk/float/levinsondurbin_FLP.c
    A code/opus-1.1/silk/float/main_FLP.h
    A code/opus-1.1/silk/float/noise_shape_analysis_FLP.c
    A code/opus-1.1/silk/float/pitch_analysis_core_FLP.c
    A code/opus-1.1/silk/float/prefilter_FLP.c
    A code/opus-1.1/silk/float/process_gains_FLP.c
    A code/opus-1.1/silk/float/regularize_correlations_FLP.c
    A code/opus-1.1/silk/float/residual_energy_FLP.c
    A code/opus-1.1/silk/float/scale_copy_vector_FLP.c
    A code/opus-1.1/silk/float/scale_vector_FLP.c
    A code/opus-1.1/silk/float/schur_FLP.c
    A code/opus-1.1/silk/float/solve_LS_FLP.c
    A code/opus-1.1/silk/float/sort_FLP.c
    A code/opus-1.1/silk/float/structs_FLP.h
    A code/opus-1.1/silk/float/warped_autocorrelation_FLP.c
    A code/opus-1.1/silk/float/wrappers_FLP.c
    A code/opus-1.1/silk/gain_quant.c
    A code/opus-1.1/silk/init_decoder.c
    A code/opus-1.1/silk/init_encoder.c
    A code/opus-1.1/silk/inner_prod_aligned.c
    A code/opus-1.1/silk/interpolate.c
    A code/opus-1.1/silk/lin2log.c
    A code/opus-1.1/silk/log2lin.c
    A code/opus-1.1/silk/macros.h
    A code/opus-1.1/silk/main.h
    A code/opus-1.1/silk/pitch_est_defines.h
    A code/opus-1.1/silk/pitch_est_tables.c
    A code/opus-1.1/silk/process_NLSFs.c
    A code/opus-1.1/silk/quant_LTP_gains.c
    A code/opus-1.1/silk/resampler.c
    A code/opus-1.1/silk/resampler_down2.c
    A code/opus-1.1/silk/resampler_down2_3.c
    A code/opus-1.1/silk/resampler_private.h
    A code/opus-1.1/silk/resampler_private_AR2.c
    A code/opus-1.1/silk/resampler_private_IIR_FIR.c
    A code/opus-1.1/silk/resampler_private_down_FIR.c
    A code/opus-1.1/silk/resampler_private_up2_HQ.c
    A code/opus-1.1/silk/resampler_rom.c
    A code/opus-1.1/silk/resampler_rom.h
    A code/opus-1.1/silk/resampler_structs.h
    A code/opus-1.1/silk/shell_coder.c
    A code/opus-1.1/silk/sigm_Q15.c
    A code/opus-1.1/silk/sort.c
    A code/opus-1.1/silk/stereo_LR_to_MS.c
    A code/opus-1.1/silk/stereo_MS_to_LR.c
    A code/opus-1.1/silk/stereo_decode_pred.c
    A code/opus-1.1/silk/stereo_encode_pred.c
    A code/opus-1.1/silk/stereo_find_predictor.c
    A code/opus-1.1/silk/stereo_quant_pred.c
    A code/opus-1.1/silk/structs.h
    A code/opus-1.1/silk/sum_sqr_shift.c
    A code/opus-1.1/silk/table_LSF_cos.c
    A code/opus-1.1/silk/tables.h
    A code/opus-1.1/silk/tables_LTP.c
    A code/opus-1.1/silk/tables_NLSF_CB_NB_MB.c
    A code/opus-1.1/silk/tables_NLSF_CB_WB.c
    A code/opus-1.1/silk/tables_gain.c
    A code/opus-1.1/silk/tables_other.c
    A code/opus-1.1/silk/tables_pitch_lag.c
    A code/opus-1.1/silk/tables_pulses_per_block.c
    A code/opus-1.1/silk/tuning_parameters.h
    A code/opus-1.1/silk/typedef.h
    A code/opus-1.1/src/analysis.c
    A code/opus-1.1/src/analysis.h
    A code/opus-1.1/src/mlp.c
    A code/opus-1.1/src/mlp.h
    A code/opus-1.1/src/mlp_data.c
    A code/opus-1.1/src/opus.c
    A code/opus-1.1/src/opus_decoder.c
    A code/opus-1.1/src/opus_encoder.c
    A code/opus-1.1/src/opus_multistream.c
    A code/opus-1.1/src/opus_multistream_decoder.c
    A code/opus-1.1/src/opus_multistream_encoder.c
    A code/opus-1.1/src/opus_private.h
    A code/opus-1.1/src/repacketizer.c
    A code/opus-1.1/src/tansig_table.h
    R code/opusfile-0.2/include/opusfile.h
    R code/opusfile-0.2/src/http.c
    R code/opusfile-0.2/src/info.c
    R code/opusfile-0.2/src/internal.c
    R code/opusfile-0.2/src/internal.h
    R code/opusfile-0.2/src/opusfile.c
    R code/opusfile-0.2/src/stream.c
    A code/opusfile-0.5/include/opusfile.h
    A code/opusfile-0.5/src/http.c
    A code/opusfile-0.5/src/info.c
    A code/opusfile-0.5/src/internal.c
    A code/opusfile-0.5/src/internal.h
    A code/opusfile-0.5/src/opusfile.c
    A code/opusfile-0.5/src/stream.c
    A code/opusfile-0.5/src/wincerts.c
    A code/opusfile-0.5/src/winerrno.h

  Log Message:
  -----------
  Merge branch 'master' into sdl2


  Commit: 1250b352bebdc26490cf198dbce683edcb07f8ff
      https://github.com/ioquake/ioq3/commit/1250b352bebdc26490cf198dbce683edcb07f8ff
  Author: Tim Angus <tim at ngus.net>
  Date:   2014-02-18 (Tue, 18 Feb 2014)

  Changed paths:
    M code/client/cl_curl.h
    M code/client/cl_main.c
    A code/libcurl-7.35.0/curl/curl.h
    A code/libcurl-7.35.0/curl/curlbuild.h
    A code/libcurl-7.35.0/curl/curlrules.h
    A code/libcurl-7.35.0/curl/curlver.h
    A code/libcurl-7.35.0/curl/easy.h
    A code/libcurl-7.35.0/curl/mprintf.h
    A code/libcurl-7.35.0/curl/multi.h
    A code/libcurl-7.35.0/curl/stdcheaders.h
    A code/libcurl-7.35.0/curl/typecheck-gcc.h
    R code/libcurl/curl/curl.h
    R code/libcurl/curl/curlver.h
    R code/libcurl/curl/easy.h
    R code/libcurl/curl/mprintf.h
    R code/libcurl/curl/multi.h
    R code/libcurl/curl/stdcheaders.h
    R code/libcurl/curl/types.h
    M code/libs/win32/libcurl.a
    M code/libs/win64/libcurl.a
    M code/renderergl2/glsl/generic_fp.glsl
    M code/renderergl2/glsl/lightall_fp.glsl
    M code/renderergl2/tr_bsp.c
    M code/renderergl2/tr_extensions.c
    M code/renderergl2/tr_glsl.c
    M code/renderergl2/tr_local.h
    M code/server/sv_client.c

  Log Message:
  -----------
  Merge branch 'master' into sdl2


  Commit: 9ec7931c54b052df04ee55bd84652021937c0cb2
      https://github.com/ioquake/ioq3/commit/9ec7931c54b052df04ee55bd84652021937c0cb2
  Author: Zack Middleton <zturtleman at gmail.com>
  Date:   2014-03-08 (Sat, 08 Mar 2014)

  Changed paths:
    M code/client/qal.c
    M code/client/qal.h
    M code/client/snd_openal.c
    M code/game/g_syscalls.c
    M code/renderergl2/glsl/lightall_fp.glsl
    M code/renderergl2/glsl/shadowmask_fp.glsl
    M code/renderergl2/tr_animation.c
    M code/renderergl2/tr_bsp.c
    M code/renderergl2/tr_glsl.c
    M code/renderergl2/tr_image.c
    M code/renderergl2/tr_init.c
    M code/renderergl2/tr_local.h
    M code/renderergl2/tr_shade.c
    M code/renderergl2/tr_shader.c
    M code/renderergl2/tr_sky.c
    M opengl2-readme.txt

  Log Message:
  -----------
  Merge branch 'master' into sdl2


  Commit: dafed0fd666a30f1e7c7deb9d1c7d2599ee0d887
      https://github.com/ioquake/ioq3/commit/dafed0fd666a30f1e7c7deb9d1c7d2599ee0d887
  Author: MAN-AT-ARMS <donny at ecgnetwork.com>
  Date:   2014-03-08 (Sat, 08 Mar 2014)

  Changed paths:
    M Makefile
    M code/SDL2/include/SDL.h
    M code/SDL2/include/SDL_assert.h
    M code/SDL2/include/SDL_atomic.h
    M code/SDL2/include/SDL_audio.h
    M code/SDL2/include/SDL_bits.h
    M code/SDL2/include/SDL_blendmode.h
    M code/SDL2/include/SDL_clipboard.h
    M code/SDL2/include/SDL_config.h
    A code/SDL2/include/SDL_config.h.cmake
    A code/SDL2/include/SDL_config.h.in
    M code/SDL2/include/SDL_config_android.h
    M code/SDL2/include/SDL_config_iphoneos.h
    M code/SDL2/include/SDL_config_macosx.h
    M code/SDL2/include/SDL_config_minimal.h
    R code/SDL2/include/SDL_config_nintendods.h
    M code/SDL2/include/SDL_config_pandora.h
    M code/SDL2/include/SDL_config_psp.h
    M code/SDL2/include/SDL_config_windows.h
    M code/SDL2/include/SDL_config_wiz.h
    M code/SDL2/include/SDL_copying.h
    M code/SDL2/include/SDL_cpuinfo.h
    A code/SDL2/include/SDL_egl.h
    M code/SDL2/include/SDL_endian.h
    M code/SDL2/include/SDL_error.h
    M code/SDL2/include/SDL_events.h
    A code/SDL2/include/SDL_filesystem.h
    M code/SDL2/include/SDL_gamecontroller.h
    M code/SDL2/include/SDL_gesture.h
    M code/SDL2/include/SDL_haptic.h
    M code/SDL2/include/SDL_hints.h
    R code/SDL2/include/SDL_input.h
    M code/SDL2/include/SDL_joystick.h
    M code/SDL2/include/SDL_keyboard.h
    M code/SDL2/include/SDL_keycode.h
    M code/SDL2/include/SDL_loadso.h
    M code/SDL2/include/SDL_log.h
    M code/SDL2/include/SDL_main.h
    M code/SDL2/include/SDL_messagebox.h
    M code/SDL2/include/SDL_mouse.h
    M code/SDL2/include/SDL_mutex.h
    M code/SDL2/include/SDL_opengl.h
    M code/SDL2/include/SDL_opengles.h
    M code/SDL2/include/SDL_opengles2.h
    M code/SDL2/include/SDL_pixels.h
    M code/SDL2/include/SDL_platform.h
    M code/SDL2/include/SDL_power.h
    M code/SDL2/include/SDL_quit.h
    M code/SDL2/include/SDL_rect.h
    M code/SDL2/include/SDL_render.h
    M code/SDL2/include/SDL_revision.h
    M code/SDL2/include/SDL_rwops.h
    M code/SDL2/include/SDL_scancode.h
    M code/SDL2/include/SDL_shape.h
    M code/SDL2/include/SDL_stdinc.h
    M code/SDL2/include/SDL_surface.h
    M code/SDL2/include/SDL_system.h
    M code/SDL2/include/SDL_syswm.h
    M code/SDL2/include/SDL_test.h
    M code/SDL2/include/SDL_test_assert.h
    M code/SDL2/include/SDL_test_common.h
    M code/SDL2/include/SDL_test_compare.h
    M code/SDL2/include/SDL_test_crc32.h
    M code/SDL2/include/SDL_test_font.h
    M code/SDL2/include/SDL_test_fuzzer.h
    M code/SDL2/include/SDL_test_harness.h
    M code/SDL2/include/SDL_test_images.h
    M code/SDL2/include/SDL_test_log.h
    M code/SDL2/include/SDL_test_md5.h
    M code/SDL2/include/SDL_test_random.h
    M code/SDL2/include/SDL_thread.h
    M code/SDL2/include/SDL_timer.h
    M code/SDL2/include/SDL_touch.h
    M code/SDL2/include/SDL_types.h
    M code/SDL2/include/SDL_version.h
    M code/SDL2/include/SDL_video.h
    M code/SDL2/include/begin_code.h
    M code/SDL2/include/close_code.h
    A code/SDL2/include/doxyfile
    M code/libs/macosx/libSDL2-2.0.0.dylib
    M code/libs/macosx/libSDL2main.a
    A code/libs/win32/SDL2.dll
    M code/libs/win32/libSDL2.a
    R code/libs/win32/libSDL2.dll
    M code/libs/win32/libSDL2.dll.a
    M code/libs/win32/libSDL2main.a
    A code/libs/win64/SDL264.dll
    R code/libs/win64/libSDL2.a
    R code/libs/win64/libSDL2.dll
    R code/libs/win64/libSDL2.dll.a
    A code/libs/win64/libSDL264.a
    A code/libs/win64/libSDL264.dll.a
    A code/libs/win64/libSDL264main.a
    R code/libs/win64/libSDL2main.a

  Log Message:
  -----------
  Update SDL2 to 2.0.2


  Commit: 8455b5a833442d5836d2329c605534a4fca284f9
      https://github.com/ioquake/ioq3/commit/8455b5a833442d5836d2329c605534a4fca284f9
  Author: Zack Middleton <zturtleman at gmail.com>
  Date:   2014-03-15 (Sat, 15 Mar 2014)

  Changed paths:
    M code/sdl/sdl_glimp.c

  Log Message:
  -----------
  Don't crash when fail to create SDL window


  Commit: 344ff23164cdf39285a3dc5310f9c57155602923
      https://github.com/ioquake/ioq3/commit/344ff23164cdf39285a3dc5310f9c57155602923
  Author: Zack Middleton <zturtleman at gmail.com>
  Date:   2014-03-17 (Mon, 17 Mar 2014)

  Changed paths:
    M code/sdl/sdl_glimp.c

  Log Message:
  -----------
  Fix multisampling on X11

Setting SDL_GL_ACCELERATED_VISUAL was disabled for ioq3 SDL 1.2
for other reasons. However, it causes creating GL context to fail
if multisampling is enabled on X11 for both SDL1.2 and SDL2.

Tested using nVidia proprietary driver on Debian 7.


  Commit: 9f22ae9cb232e39da7490ada99412e44cdf00a4a
      https://github.com/ioquake/ioq3/commit/9f22ae9cb232e39da7490ada99412e44cdf00a4a
  Author: Zack Middleton <zturtleman at gmail.com>
  Date:   2014-03-17 (Mon, 17 Mar 2014)

  Changed paths:
    M code/sdl/sdl_input.c

  Log Message:
  -----------
  Fix ctrl-c etc codes for edit fields


  Commit: 73aa7ef2c76955495c892b91126a935473cd75be
      https://github.com/ioquake/ioq3/commit/73aa7ef2c76955495c892b91126a935473cd75be
  Author: Zack Middleton <zturtleman at gmail.com>
  Date:   2014-03-24 (Mon, 24 Mar 2014)

  Changed paths:
    M code/cgame/cg_effects.c
    M code/cgame/cg_localents.c
    M code/cgame/cg_players.c
    M code/cgame/cg_playerstate.c
    M code/cgame/cg_view.c
    M code/cgame/cg_weapons.c
    M code/client/snd_mix.c
    M code/client/snd_openal.c
    M code/game/ai_main.c
    M code/game/bg_pmove.c
    M code/game/g_client.c
    M code/game/g_cmds.c
    M code/game/g_combat.c
    M code/game/g_items.c
    M code/qcommon/common.c
    M code/qcommon/files.c
    M code/qcommon/q_shared.h
    M code/renderercommon/tr_types.h
    M code/renderergl1/tr_bsp.c
    M code/renderergl1/tr_shader.c
    M code/renderergl2/glsl/lightall_fp.glsl
    M code/renderergl2/tr_bsp.c
    M code/renderergl2/tr_glsl.c
    M code/renderergl2/tr_local.h
    M code/renderergl2/tr_main.c
    M code/renderergl2/tr_shade.c
    M code/renderergl2/tr_shader.c
    M code/renderergl2/tr_world.c

  Log Message:
  -----------
  Merge branch 'master' (early part) into sdl2


  Commit: 8b06986a9f6d2164d569a6ec3105daf2ef24ea47
      https://github.com/ioquake/ioq3/commit/8b06986a9f6d2164d569a6ec3105daf2ef24ea47
  Author: Zack Middleton <zturtleman at gmail.com>
  Date:   2014-03-24 (Mon, 24 Mar 2014)

  Log Message:
  -----------
  Skip merging sdl1.2 commit into sdl2


  Commit: c55df2c9aa4eb64943fd9a91fc547a4f562fc9a5
      https://github.com/ioquake/ioq3/commit/c55df2c9aa4eb64943fd9a91fc547a4f562fc9a5
  Author: Zack Middleton <zturtleman at gmail.com>
  Date:   2014-03-24 (Mon, 24 Mar 2014)

  Changed paths:
    M Makefile
    M code/game/ai_dmq3.c
    A code/libvorbis-1.3.4/include/vorbis/codec.h
    A code/libvorbis-1.3.4/include/vorbis/vorbisenc.h
    A code/libvorbis-1.3.4/include/vorbis/vorbisfile.h
    A code/libvorbis-1.3.4/lib/analysis.c
    A code/libvorbis-1.3.4/lib/backends.h
    A code/libvorbis-1.3.4/lib/bitrate.c
    A code/libvorbis-1.3.4/lib/bitrate.h
    A code/libvorbis-1.3.4/lib/block.c
    A code/libvorbis-1.3.4/lib/books/coupled/res_books_51.h
    A code/libvorbis-1.3.4/lib/books/coupled/res_books_stereo.h
    A code/libvorbis-1.3.4/lib/books/floor/floor_books.h
    A code/libvorbis-1.3.4/lib/books/uncoupled/res_books_uncoupled.h
    A code/libvorbis-1.3.4/lib/codebook.c
    A code/libvorbis-1.3.4/lib/codebook.h
    A code/libvorbis-1.3.4/lib/codec_internal.h
    A code/libvorbis-1.3.4/lib/envelope.c
    A code/libvorbis-1.3.4/lib/envelope.h
    A code/libvorbis-1.3.4/lib/floor0.c
    A code/libvorbis-1.3.4/lib/floor1.c
    A code/libvorbis-1.3.4/lib/highlevel.h
    A code/libvorbis-1.3.4/lib/info.c
    A code/libvorbis-1.3.4/lib/lookup.c
    A code/libvorbis-1.3.4/lib/lookup.h
    A code/libvorbis-1.3.4/lib/lookup_data.h
    A code/libvorbis-1.3.4/lib/lpc.c
    A code/libvorbis-1.3.4/lib/lpc.h
    A code/libvorbis-1.3.4/lib/lsp.c
    A code/libvorbis-1.3.4/lib/lsp.h
    A code/libvorbis-1.3.4/lib/mapping0.c
    A code/libvorbis-1.3.4/lib/masking.h
    A code/libvorbis-1.3.4/lib/mdct.c
    A code/libvorbis-1.3.4/lib/mdct.h
    A code/libvorbis-1.3.4/lib/misc.h
    A code/libvorbis-1.3.4/lib/modes/floor_all.h
    A code/libvorbis-1.3.4/lib/modes/psych_11.h
    A code/libvorbis-1.3.4/lib/modes/psych_16.h
    A code/libvorbis-1.3.4/lib/modes/psych_44.h
    A code/libvorbis-1.3.4/lib/modes/psych_8.h
    A code/libvorbis-1.3.4/lib/modes/residue_16.h
    A code/libvorbis-1.3.4/lib/modes/residue_44.h
    A code/libvorbis-1.3.4/lib/modes/residue_44p51.h
    A code/libvorbis-1.3.4/lib/modes/residue_44u.h
    A code/libvorbis-1.3.4/lib/modes/residue_8.h
    A code/libvorbis-1.3.4/lib/modes/setup_11.h
    A code/libvorbis-1.3.4/lib/modes/setup_16.h
    A code/libvorbis-1.3.4/lib/modes/setup_22.h
    A code/libvorbis-1.3.4/lib/modes/setup_32.h
    A code/libvorbis-1.3.4/lib/modes/setup_44.h
    A code/libvorbis-1.3.4/lib/modes/setup_44p51.h
    A code/libvorbis-1.3.4/lib/modes/setup_44u.h
    A code/libvorbis-1.3.4/lib/modes/setup_8.h
    A code/libvorbis-1.3.4/lib/modes/setup_X.h
    A code/libvorbis-1.3.4/lib/os.h
    A code/libvorbis-1.3.4/lib/psy.c
    A code/libvorbis-1.3.4/lib/psy.h
    A code/libvorbis-1.3.4/lib/registry.c
    A code/libvorbis-1.3.4/lib/registry.h
    A code/libvorbis-1.3.4/lib/res0.c
    A code/libvorbis-1.3.4/lib/scales.h
    A code/libvorbis-1.3.4/lib/sharedbook.c
    A code/libvorbis-1.3.4/lib/smallft.c
    A code/libvorbis-1.3.4/lib/smallft.h
    A code/libvorbis-1.3.4/lib/synthesis.c
    A code/libvorbis-1.3.4/lib/vorbisenc.c
    A code/libvorbis-1.3.4/lib/vorbisfile.c
    A code/libvorbis-1.3.4/lib/window.c
    A code/libvorbis-1.3.4/lib/window.h
    M code/renderergl1/tr_image.c
    M code/renderergl2/tr_image.c
    M code/server/sv_ccmds.c
    M code/sys/sys_main.c

  Log Message:
  -----------
  Merge branch 'master' into sdl2


  Commit: d426ed307df4c04f01be52ee3c0e7e9c34ca4164
      https://github.com/ioquake/ioq3/commit/d426ed307df4c04f01be52ee3c0e7e9c34ca4164
  Author: MAN-AT-ARMS <donny at ecgnetwork.com>
  Date:   2014-03-24 (Mon, 24 Mar 2014)

  Changed paths:
    M code/SDL2/include/SDL_config.h
    M code/SDL2/include/SDL_config.h.cmake
    M code/SDL2/include/SDL_config.h.in
    M code/SDL2/include/SDL_config_windows.h
    A code/SDL2/include/SDL_config_winrt.h
    M code/SDL2/include/SDL_cpuinfo.h
    M code/SDL2/include/SDL_egl.h
    M code/SDL2/include/SDL_hints.h
    M code/SDL2/include/SDL_main.h
    M code/SDL2/include/SDL_name.h
    M code/SDL2/include/SDL_platform.h
    M code/SDL2/include/SDL_revision.h
    M code/SDL2/include/SDL_stdinc.h
    M code/SDL2/include/SDL_system.h
    M code/SDL2/include/SDL_syswm.h
    M code/SDL2/include/SDL_version.h
    M code/SDL2/include/begin_code.h
    M code/libs/macosx/libSDL2-2.0.0.dylib
    M code/libs/macosx/libSDL2main.a
    M code/libs/win32/SDL2.dll
    M code/libs/win32/libSDL2.a
    M code/libs/win32/libSDL2.dll.a
    M code/libs/win32/libSDL2main.a
    M code/libs/win64/SDL264.dll
    M code/libs/win64/libSDL264.a
    M code/libs/win64/libSDL264.dll.a
    M code/libs/win64/libSDL264main.a

  Log Message:
  -----------
  Update SDL2 to 2.0.3


  Commit: cfcd2d2d7fe2b72e6b6b8d13adb7601b60329a8e
      https://github.com/ioquake/ioq3/commit/cfcd2d2d7fe2b72e6b6b8d13adb7601b60329a8e
  Author: Zack Middleton <zturtleman at gmail.com>
  Date:   2014-03-24 (Mon, 24 Mar 2014)

  Changed paths:
    M code/SDL2/include/SDL_config.h
    M code/SDL2/include/SDL_config.h.cmake
    M code/SDL2/include/SDL_config.h.in
    M code/SDL2/include/SDL_config_windows.h
    A code/SDL2/include/SDL_config_winrt.h
    M code/SDL2/include/SDL_cpuinfo.h
    M code/SDL2/include/SDL_egl.h
    M code/SDL2/include/SDL_hints.h
    M code/SDL2/include/SDL_main.h
    M code/SDL2/include/SDL_name.h
    M code/SDL2/include/SDL_platform.h
    M code/SDL2/include/SDL_revision.h
    M code/SDL2/include/SDL_stdinc.h
    M code/SDL2/include/SDL_system.h
    M code/SDL2/include/SDL_syswm.h
    M code/SDL2/include/SDL_version.h
    M code/SDL2/include/begin_code.h
    M code/libs/macosx/libSDL2-2.0.0.dylib
    M code/libs/macosx/libSDL2main.a
    M code/libs/win32/SDL2.dll
    M code/libs/win32/libSDL2.a
    M code/libs/win32/libSDL2.dll.a
    M code/libs/win32/libSDL2main.a
    M code/libs/win64/SDL264.dll
    M code/libs/win64/libSDL264.a
    M code/libs/win64/libSDL264.dll.a
    M code/libs/win64/libSDL264main.a

  Log Message:
  -----------
  Merge pull request #65 from MAN-AT-ARMS/sdl2_203

Update SDL2 to 2.0.3


  Commit: 6a33a697951acbaca3fd38f28804eab54c36bd5c
      https://github.com/ioquake/ioq3/commit/6a33a697951acbaca3fd38f28804eab54c36bd5c
  Author: Zack Middleton <zturtleman at gmail.com>
  Date:   2014-05-19 (Mon, 19 May 2014)

  Changed paths:
    M code/sdl/sdl_input.c

  Log Message:
  -----------
  Disable key repeat if key catcher is 0

SDL1.2 branch disables key repeat when key catcher is 0.
Presumably to prevent binds from executing multiple times.

SDL2 replaced being able to disabled key repeat using SDL_EnableKeyRepeat
with a non-zero repeat value in the key event.


  Commit: b87d889af85d7895f3c179e613255a350da31d61
      https://github.com/ioquake/ioq3/commit/b87d889af85d7895f3c179e613255a350da31d61
  Author: Zack Middleton <zturtleman at gmail.com>
  Date:   2014-06-03 (Tue, 03 Jun 2014)

  Changed paths:
    M .gitignore
    A misc/msvc11/cgame.vcxproj
    A misc/msvc11/cgame.vcxproj.filters
    A misc/msvc11/game.vcxproj
    A misc/msvc11/game.vcxproj.filters
    A misc/msvc11/ioq3.sln
    A misc/msvc11/ioq3.v11.suo
    A misc/msvc11/q3_ui.vcxproj
    A misc/msvc11/q3_ui.vcxproj.filters
    A misc/msvc11/quake3.vcxproj
    A misc/msvc11/quake3.vcxproj.filters
    A misc/msvc11/ui.vcxproj
    A misc/msvc11/ui.vcxproj.filters

  Log Message:
  -----------
  Merge branch 'master' (early part 1) into sdl2


  Commit: b5a17f30586f82df782c9cd4fed519b9c4c8c230
      https://github.com/ioquake/ioq3/commit/b5a17f30586f82df782c9cd4fed519b9c4c8c230
  Author: Zack Middleton <zturtleman at gmail.com>
  Date:   2014-06-03 (Tue, 03 Jun 2014)

  Log Message:
  -----------
  Skip merging a SDL 1.2 commit into sdl2


  Commit: b12a9acf4d5089c766f69f029c4c4e0e012994ca
      https://github.com/ioquake/ioq3/commit/b12a9acf4d5089c766f69f029c4c4e0e012994ca
  Author: Zack Middleton <zturtleman at gmail.com>
  Date:   2014-06-03 (Tue, 03 Jun 2014)

  Changed paths:
    M code/renderergl2/glsl/calclevels4x_fp.glsl
    M code/renderergl2/glsl/lightall_fp.glsl
    M code/renderergl2/glsl/lightall_vp.glsl
    M code/renderergl2/glsl/tonemap_fp.glsl
    M code/renderergl2/tr_extensions.c
    M code/renderergl2/tr_glsl.c
    M code/renderergl2/tr_image.c
    M code/renderergl2/tr_init.c
    M code/renderergl2/tr_local.h
    M code/renderergl2/tr_main.c
    M code/renderergl2/tr_shader.c
    M opengl2-readme.txt

  Log Message:
  -----------
  Merge branch 'master' (early part 2) into sdl2


  Commit: cd3b7133aec0d45b76a113cf83a17b0b8c37fbab
      https://github.com/ioquake/ioq3/commit/cd3b7133aec0d45b76a113cf83a17b0b8c37fbab
  Author: Zack Middleton <zturtleman at gmail.com>
  Date:   2014-06-03 (Tue, 03 Jun 2014)

  Log Message:
  -----------
  Skip merging a SDL 1.2 commit into sdl2


  Commit: 107cae63d624e7083d3866db464910710c671c8b
      https://github.com/ioquake/ioq3/commit/107cae63d624e7083d3866db464910710c671c8b
  Author: Zack Middleton <zturtleman at gmail.com>
  Date:   2014-06-03 (Tue, 03 Jun 2014)

  Changed paths:
    M .travis.yml
    M code/botlib/l_precomp.c
    M code/botlib/l_script.c
    M code/cgame/cg_players.c
    M code/q3_ui/ui_controls2.c
    M code/q3_ui/ui_players.c
    M code/qcommon/cm_patch.c
    M code/renderergl1/tr_model.c
    M code/renderergl1/tr_shader.c
    M code/renderergl2/tr_init.c
    M code/renderergl2/tr_local.h
    M code/renderergl2/tr_main.c
    M code/renderergl2/tr_model.c
    M code/renderergl2/tr_shader.c
    M code/server/sv_ccmds.c
    M code/sys/con_win32.c
    M code/ui/ui_players.c
    M code/ui/ui_shared.c
    M misc/msvc11/quake3.vcxproj
    M opengl2-readme.txt
    M travis-ci-build.sh

  Log Message:
  -----------
  Merge branch 'master' into sdl2

Conflicts:
	.travis.yml


  Commit: 7d026177ad6e572fe43bd70cebf7b529c739a5e7
      https://github.com/ioquake/ioq3/commit/7d026177ad6e572fe43bd70cebf7b529c739a5e7
  Author: Tim Angus <tim.angus at roslin.ed.ac.uk>
  Date:   2014-08-25 (Mon, 25 Aug 2014)

  Changed paths:
    M code/botlib/be_aas_reach.c
    M code/botlib/be_aas_route.c
    M code/opus-1.1/silk/float/solve_LS_FLP.c
    M code/opusfile-0.5/src/opusfile.c
    M code/renderercommon/qgl.h
    M code/renderergl2/tr_extensions.c
    M code/renderergl2/tr_image.c

  Log Message:
  -----------
  Fix assorted warnings


  Commit: 2a3368481d67685fd05494ba5da2cc2078ca4c01
      https://github.com/ioquake/ioq3/commit/2a3368481d67685fd05494ba5da2cc2078ca4c01
  Author: Tim Angus <tim.angus at roslin.ed.ac.uk>
  Date:   2014-08-25 (Mon, 25 Aug 2014)

  Changed paths:
    M Makefile
    M README.md
    M code/client/cl_console.c
    M code/q3_ui/ui_mfield.c
    M code/qcommon/q_shared.c
    M code/qcommon/vm_x86.c
    M code/renderergl2/glsl/shadowmask_fp.glsl
    M code/renderergl2/tr_backend.c
    M code/renderergl2/tr_bsp.c
    M code/renderergl2/tr_extramath.h
    M code/renderergl2/tr_fbo.c
    M code/renderergl2/tr_glsl.c
    M code/renderergl2/tr_image.c
    M code/renderergl2/tr_init.c
    M code/renderergl2/tr_local.h
    M code/renderergl2/tr_main.c
    M code/renderergl2/tr_scene.c
    M code/renderergl2/tr_world.c
    M code/sdl/sdl_input.c
    M misc/msvc/opengl1.vcproj
    M misc/msvc/opengl2.vcproj
    M misc/msvc/quake3.vcproj
    M misc/msvc10/quake3.vcxproj
    M misc/msvc11/quake3.vcxproj

  Log Message:
  -----------
  Merge branch 'master' into sdl2

Conflicts:
	Makefile
	code/renderergl2/tr_image.c


Compare: https://github.com/ioquake/ioq3/compare/ca9eebb12545...2a3368481d67


More information about the quake3-commits mailing list