[Pcgen-github] [PCGen/pcgen] 255574: DATA-2322

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

  Branch: refs/heads/master
  Home:   https://github.com/PCGen/pcgen
  Commit: 255574d1d52e0e22da81a544ca403634636c82ee
      https://github.com/PCGen/pcgen/commit/255574d1d52e0e22da81a544ca403634636c82ee
  Author: LegacyKing <dre...@ya...>
  Date:   2015-01-22 (Thu, 22 Jan 2015)

  Changed paths:
    M data/pathfinder/paizo/campaign_setting/inner_sea_world_guide/iswg_abilities_class.lst
    M data/pathfinder/paizo/campaign_setting/inner_sea_world_guide/iswg_domains.lst
    M data/pathfinder/paizo/roleplaying_game/core_rulebook/cr_abilities_class.lst
    M data/pathfinder/paizo/roleplaying_game/core_rulebook/cr_abilitycategories.lst
    M data/pathfinder/paizo/roleplaying_game/ultimate_magic/um_abilities_class.lst

  Log Message:
  -----------
  DATA-2322
[Pathfinder] Core Rulebook - Allow Draconic Bloodline to be expanded and simplify the format

NEWSOURCE-232
[Paizo] Player Companion: People of the Stars

Work to match new source and existing source.


  Commit: 004bdd4cfaaaa7bb458f0ae264225d47e5b7f379
      https://github.com/PCGen/pcgen/commit/004bdd4cfaaaa7bb458f0ae264225d47e5b7f379
  Author: LegacyKing <dre...@ya...>
  Date:   2015-01-22 (Thu, 22 Jan 2015)

  Changed paths:
    M data/pathfinder_pfs/paizo/campaign_setting/pfs_inner_sea_world_guide/pfs_iswg_domains.lst

  Log Message:
  -----------
  DATA-2322
[Pathfinder] Core Rulebook - Allow Draconic Bloodline to be expanded and simplify the format

NEWSOURCE-232
[Paizo] Player Companion: People of the Stars

Correct PFS to new changes


  Commit: 8f3f1929da029d2b677b997db1b824a5de0297ae
      https://github.com/PCGen/pcgen/commit/8f3f1929da029d2b677b997db1b824a5de0297ae
  Author: Andrew Maitland <dre...@ya...>
  Date:   2015-01-22 (Thu, 22 Jan 2015)

  Changed paths:
    M data/pathfinder/paizo/campaign_setting/inner_sea_world_guide/iswg_abilities_class.lst
    M data/pathfinder/paizo/campaign_setting/inner_sea_world_guide/iswg_domains.lst
    M data/pathfinder/paizo/roleplaying_game/core_rulebook/cr_abilities_class.lst
    M data/pathfinder/paizo/roleplaying_game/core_rulebook/cr_abilitycategories.lst
    M data/pathfinder/paizo/roleplaying_game/ultimate_magic/um_abilities_class.lst
    M data/pathfinder_pfs/paizo/campaign_setting/pfs_inner_sea_world_guide/pfs_iswg_domains.lst

  Log Message:
  -----------
  Merge pull request #102 from LegacyKing/DATA-2322

Data 2322


Compare: https://github.com/PCGen/pcgen/compare/a09662109341...8f3f1929da02