[Commits] [wesnoth/wesnoth] d66e33: Merge contents of two prefs files

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: d66e33c80fab1436a20c74bc2fb983ef8cc0e121
      https://github.com/wesnoth/wesnoth/commit/d66e33c80fab1436a20c74bc2fb983ef8cc0e121
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2016-03-04 (Fri, 04 Mar 2016)

  Changed paths:
    M src/CMakeLists.txt
    M src/SConscript
    R src/game_preferences_display.cpp
    M src/preferences_display.cpp

  Log Message:
  -----------
  Merge contents of two prefs files

This moves these functions' implementations with others in the same header