[Pcgen-github] [PCGen/pcgen] 023d26: OS-396

[GitHub <no...@gi...>]

  Branch: refs/heads/master
  Home:   https://github.com/PCGen/pcgen
  Commit: 023d2672be731a2ef2669ecabb44c07ffa57eac9
      https://github.com/PCGen/pcgen/commit/023d2672be731a2ef2669ecabb44c07ffa57eac9
  Author: Stefan Radermacher <pc...@za...>
  Date:   2015-01-05 (Mon, 05 Jan 2015)

  Changed paths:
    M outputsheets/4e/4e/htmlxml/csheet_standard_4e.htm
    M outputsheets/base.xml
    M outputsheets/base.xml.ftl
    M outputsheets/d20/fantasy/htmlxml/csheet_fantasy_compact.htm
    M outputsheets/d20/fantasy/htmlxml/csheet_fantasy_generic_export.xml.ftl
    M outputsheets/d20/fantasy/htmlxml/csheet_fantasy_std.htm.ftl
    M outputsheets/d20/fantasy_craft/htmlxml/csheet_fantasycraft_std.htm
    M outputsheets/my_outputsheets/my_fantasy/htmlxml/csheet_my_fantasy_output_sheet.htm
    M preview/d20/fantasy/Fantasy_Character_Sheet.html
    M preview/d20/fantasy/Standard.htm
    M preview/d20/fantasy/Standard.htm.ftl
    M preview/d20/fantasy/compact.htm
    M preview/d20/fantasy/preview.html
    M preview/d20/homebrew/Standard_homebrew.htm
    M preview/d20/western/Deadlands.htm

  Log Message:
  -----------
  OS-396
Fix size bonus display for CMB/CMD on output sheets.


  Commit: b37d418c39f7b0011287099af0b1dc70c4820c50
      https://github.com/PCGen/pcgen/commit/b37d418c39f7b0011287099af0b1dc70c4820c50
  Author: Andrew Maitland <dre...@ya...>
  Date:   2015-01-05 (Mon, 05 Jan 2015)

  Changed paths:
    M outputsheets/4e/4e/htmlxml/csheet_standard_4e.htm
    M outputsheets/base.xml
    M outputsheets/base.xml.ftl
    M outputsheets/d20/fantasy/htmlxml/csheet_fantasy_compact.htm
    M outputsheets/d20/fantasy/htmlxml/csheet_fantasy_generic_export.xml.ftl
    M outputsheets/d20/fantasy/htmlxml/csheet_fantasy_std.htm.ftl
    M outputsheets/d20/fantasy_craft/htmlxml/csheet_fantasycraft_std.htm
    M outputsheets/my_outputsheets/my_fantasy/htmlxml/csheet_my_fantasy_output_sheet.htm
    M preview/d20/fantasy/Fantasy_Character_Sheet.html
    M preview/d20/fantasy/Standard.htm
    M preview/d20/fantasy/Standard.htm.ftl
    M preview/d20/fantasy/compact.htm
    M preview/d20/fantasy/preview.html
    M preview/d20/homebrew/Standard_homebrew.htm
    M preview/d20/western/Deadlands.htm

  Log Message:
  -----------
  Merge pull request #11 from Zaister/OS-396

OS-396


Compare: https://github.com/PCGen/pcgen/compare/7218ff1cc1f3...b37d418c39f7