[Pcgen-github] [PCGen/pcgen] bc3414: DATA-2262

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

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

  Changed paths:
    M data/pathfinder/alluria_publishing/remarkable_races/rr_abilities_companion.lst
    M data/pathfinder/alluria_publishing/remarkable_races/rr_companionmods.lst
    M data/pathfinder/homebrew/my_homebrew/my_companionmods.lst
    M data/pathfinder/paizo/adventure_path/legacy_of_fire/players_guide/lofpg_abilities.lst
    M data/pathfinder/paizo/adventure_path/legacy_of_fire/players_guide/lofpg_companionmods.lst
    M data/pathfinder/paizo/adventure_path/reign_of_winter/players_guide/rowpg_abilities.lst
    M data/pathfinder/paizo/adventure_path/reign_of_winter/players_guide/rowpg_companionmods.lst
    M data/pathfinder/paizo/adventure_path/skull_and_shackles/ap55/ap55_abilities_race.lst
    M data/pathfinder/paizo/adventure_path/skull_and_shackles/ap55/ap55_companionmods.lst
    M data/pathfinder/paizo/player_companion/animal_archive/anar_abilities_race.lst
    M data/pathfinder/paizo/player_companion/animal_archive/anar_companionmods.lst
    M data/pathfinder/paizo/roleplaying_game/advanced_players_guide/apg_abilities_companion.lst
    M data/pathfinder/paizo/roleplaying_game/advanced_players_guide/apg_companionmods.lst
    M data/pathfinder/paizo/roleplaying_game/core_rulebook/cr_abilities_companion.lst
    M data/pathfinder/paizo/roleplaying_game/core_rulebook/cr_companionmods.lst
    M data/pathfinder/paizo/roleplaying_game/ultimate_magic/um_abilities_companion.lst
    M data/pathfinder/paizo/roleplaying_game/ultimate_magic/um_companionmods.lst
    M data/pathfinder/paizo/roleplaying_game/ultimate_magic/um_kits_companion.lst
    M data/pathfinder/paizo/roleplaying_game/ultimate_magic/um_races_companion.lst

  Log Message:
  -----------
  DATA-2262
[Pathfinder] Master granted bonuses from familiars have conflicts


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

  Changed paths:
    M data/pathfinder/alluria_publishing/remarkable_races/rr_abilities_companion.lst
    M data/pathfinder/alluria_publishing/remarkable_races/rr_companionmods.lst
    M data/pathfinder/homebrew/my_homebrew/my_companionmods.lst
    M data/pathfinder/paizo/adventure_path/legacy_of_fire/players_guide/lofpg_abilities.lst
    M data/pathfinder/paizo/adventure_path/legacy_of_fire/players_guide/lofpg_companionmods.lst
    M data/pathfinder/paizo/adventure_path/reign_of_winter/players_guide/rowpg_abilities.lst
    M data/pathfinder/paizo/adventure_path/reign_of_winter/players_guide/rowpg_companionmods.lst
    M data/pathfinder/paizo/adventure_path/skull_and_shackles/ap55/ap55_abilities_race.lst
    M data/pathfinder/paizo/adventure_path/skull_and_shackles/ap55/ap55_companionmods.lst
    M data/pathfinder/paizo/player_companion/animal_archive/anar_abilities_race.lst
    M data/pathfinder/paizo/player_companion/animal_archive/anar_companionmods.lst
    M data/pathfinder/paizo/roleplaying_game/advanced_players_guide/apg_abilities_companion.lst
    M data/pathfinder/paizo/roleplaying_game/advanced_players_guide/apg_companionmods.lst
    M data/pathfinder/paizo/roleplaying_game/core_rulebook/cr_abilities_companion.lst
    M data/pathfinder/paizo/roleplaying_game/core_rulebook/cr_companionmods.lst
    M data/pathfinder/paizo/roleplaying_game/ultimate_magic/um_abilities_companion.lst
    M data/pathfinder/paizo/roleplaying_game/ultimate_magic/um_companionmods.lst
    M data/pathfinder/paizo/roleplaying_game/ultimate_magic/um_kits_companion.lst
    M data/pathfinder/paizo/roleplaying_game/ultimate_magic/um_races_companion.lst

  Log Message:
  -----------
  Merge pull request #21 from LegacyKing/DATA-2262

DATA-2262


Compare: https://github.com/PCGen/pcgen/compare/4a3f12b9532c...c07e5aac30e3