[Commits] [wesnoth/wesnoth] bc4b4a: remove declarations of fcns that we were moved

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: bc4b4a95692e0b3682f0c1e5e32bad15a13632f5
      https://github.com/wesnoth/wesnoth/commit/bc4b4a95692e0b3682f0c1e5e32bad15a13632f5
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-06-18 (Wed, 18 Jun 2014)

  Changed paths:
    M src/unit.hpp

  Log Message:
  -----------
  remove declarations of fcns that we were moved

fixes up a4b194c0794d360dc6eff5c464c6634941dff5da


  Commit: 458c2f0f066cf6fc6762807a8c5537abaa14851e
      https://github.com/wesnoth/wesnoth/commit/458c2f0f066cf6fc6762807a8c5537abaa14851e
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-06-18 (Wed, 18 Jun 2014)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  set travis back to gcc 4.6 version

The gcc-4.8 patch requires travis to download and install gcc-4.8
from an ubuntu ppa. This takes a few mintues and the gcc build is
already fairly close to the timelimit, so this change can push
some builds over the edge. Since it doesn't seem to be strictly
necessary right now, I comment out the code for v 4.8 install.


  Commit: 32848679ad3b873dfadcc12792d74f15fd420a5a
      https://github.com/wesnoth/wesnoth/commit/32848679ad3b873dfadcc12792d74f15fd420a5a
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-06-18 (Wed, 18 Jun 2014)

  Changed paths:
    M data/campaigns/Northern_Rebirth/_main.cfg

  Log Message:
  -----------
  Merge branch 'master' of git://github.com/wesnoth/wesnoth


Compare: https://github.com/wesnoth/wesnoth/compare/46f5ff36d39f...32848679ad3b