[Pcgen-github] [PCGen/pcgen-newsources] f7a9c4: NEWSOURCE-232

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

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

  Changed paths:
    M pathfinder/paizo/player_companion/people_of_the_stars/_people_of_the_stars.pcc
    R pathfinder/paizo/player_companion/people_of_the_stars/pots_abilities.lst
    A pathfinder/paizo/player_companion/people_of_the_stars/pots_abilities_class.lst
    A pathfinder/paizo/player_companion/people_of_the_stars/pots_abilities_race.lst
    M pathfinder/paizo/player_companion/people_of_the_stars/pots_abilitycategories.lst
    A pathfinder/paizo/player_companion/people_of_the_stars/pots_deities.lst
    A pathfinder/paizo/player_companion/people_of_the_stars/pots_domains.lst
    M pathfinder/paizo/player_companion/people_of_the_stars/pots_equip.lst
    M pathfinder/paizo/player_companion/people_of_the_stars/pots_races.lst

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


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

  Changed paths:
    M pathfinder/paizo/player_companion/people_of_the_stars/pots_abilities_class.lst
    M pathfinder/paizo/player_companion/people_of_the_stars/pots_deities.lst
    M pathfinder/paizo/player_companion/people_of_the_stars/pots_languages.lst
    M pathfinder/paizo/player_companion/people_of_the_stars/pots_templates.lst

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

Clean up errors.


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

  Changed paths:
    R pathfinder/dreamscarred_press/hidden_intentions/OGL.txt
    R pathfinder/dreamscarred_press/hidden_intentions/kaigun/pe_hidden_intentions_abilities_kaigun.lst
    R pathfinder/dreamscarred_press/hidden_intentions/kaigun/pe_hidden_intentions_ability_categories_kaigun.lst
    R pathfinder/dreamscarred_press/hidden_intentions/kaigun/pe_hidden_intentions_kaigun.pcc
    R pathfinder/dreamscarred_press/hidden_intentions/pe_hidden_intentions.jpg
    R pathfinder/dreamscarred_press/hidden_intentions/pe_hidden_intentions.pcc
    R pathfinder/dreamscarred_press/hidden_intentions/pe_hidden_intentions_abilities_classes.lst
    R pathfinder/dreamscarred_press/hidden_intentions/pe_hidden_intentions_abilities_companions.lst
    R pathfinder/dreamscarred_press/hidden_intentions/pe_hidden_intentions_abilities_favored_classes.lst
    R pathfinder/dreamscarred_press/hidden_intentions/pe_hidden_intentions_ability_categories.lst
    R pathfinder/dreamscarred_press/hidden_intentions/pe_hidden_intentions_classes.lst
    R pathfinder/dreamscarred_press/hidden_intentions/pe_hidden_intentions_companion_mods.lst
    R pathfinder/dreamscarred_press/hidden_intentions/pe_hidden_intentions_equipment.lst
    R pathfinder/dreamscarred_press/hidden_intentions/pe_hidden_intentions_feats.lst
    R pathfinder/dreamscarred_press/hidden_intentions/pe_hidden_intentions_kits.lst
    R pathfinder/dreamscarred_press/hidden_intentions/pe_hidden_intentions_powers.lst
    R pathfinder/dreamscarred_press/hidden_intentions/pe_hidden_intentions_races.lst
    R pathfinder/dreamscarred_press/hidden_intentions/pe_hidden_intentions_skills.lst
    R pathfinder/dreamscarred_press/hidden_intentions/pe_hidden_intentions_templates.lst
    R pathfinder/dreamscarred_press/hidden_intentions/pe_hidden_intentions_weaponprofs.lst
    R pathfinder/dreamscarred_press/psionics_expanded/psionics_expanded_apg/psionics_expanded_abilities_apg.lst
    R pathfinder/dreamscarred_press/psionics_expanded/psionics_expanded_apg/psionics_expanded_ability_categories_apg.lst
    R pathfinder/dreamscarred_press/psionics_expanded/psionics_expanded_apg/psionics_expanded_apg.pcc
    R pathfinder/dreamscarred_press/psionics_expanded/psionics_expanded_apg/psionics_expanded_companion_mods_apg.lst
    R pathfinder/dreamscarred_press/psionics_expanded/psionics_expanded_apg/psionics_expanded_feats_mods_apg.lst
    R pathfinder/dreamscarred_press/psionics_expanded/psionics_expanded_apg/psionics_expanded_kits_apg.lst
    R pathfinder/dreamscarred_press/psionics_expanded/psionics_expanded_apg/psionics_expanded_races_apg.lst
    R pathfinder/dreamscarred_press/psionics_expanded/psionics_expanded_uc/psionics_expanded_abilities_uc.lst
    R pathfinder/dreamscarred_press/psionics_expanded/psionics_expanded_uc/psionics_expanded_ability_categories_uc.lst
    R pathfinder/dreamscarred_press/psionics_expanded/psionics_expanded_uc/psionics_expanded_uc.pcc
    A pathfinder/paizo/adventure_path/iron_gods/players_guide/PZO9000-15E.jpg
    M pathfinder/paizo/adventure_path/iron_gods/players_guide/_iron_gods_players_guide.pcc
    M pathfinder/paizo/adventure_path/iron_gods/players_guide/ogl.txt
    M pathfinder/paizo/adventure_path/reign_of_winter/ap67/ap67.pcc
    M pathfinder/paizo/adventure_path/reign_of_winter/ap67/ap67_abilities.lst
    M pathfinder/paizo/adventure_path/reign_of_winter/ap67/ap67_equip_arms_armor.lst
    M pathfinder/paizo/adventure_path/reign_of_winter/ap67/ap67_equip_magic_items.lst
    M pathfinder/paizo/adventure_path/reign_of_winter/ap67/ap67_kits_races.lst
    M pathfinder/paizo/adventure_path/reign_of_winter/ap67/ap67_profs_weapon.lst
    M pathfinder/paizo/adventure_path/reign_of_winter/ap67/ap67_races.lst
    M pathfinder/paizo/adventure_path/reign_of_winter/ap67/ap67_skills.lst
    M pathfinder/paizo/adventure_path/reign_of_winter/ap67/ap67_spells.lst
    M pathfinder/paizo/adventure_path/reign_of_winter/ap67/ap67_templates.lst
    M pathfinder/paizo/campaign_setting/technology_guide/_technology_guide.pcc
    M pathfinder/paizo/campaign_setting/technology_guide/tg_equip.lst
    A pathfinder/paizo/campaign_setting/technology_guide/tg_profs_weapon.lst
    A pathfinder/paizo/player_companion/people_of_the_stars/ogl.txt
    A pathfinder/paizo/player_companion/people_of_the_stars/pots_abilities.lst
    M pathfinder/paizo/player_companion/people_of_the_stars/pots_abilities_feat.lst
    A pathfinder/paizo/player_companion/people_of_the_stars/pots_spells.lst
    A pathfinder/paizo/player_companion/taldor_echoes_of_glory/PZO9405_180.jpeg
    M pathfinder/paizo/player_companion/taldor_echoes_of_glory/_taldor_echoes_of_glory.pcc
    M pathfinder/paizo/player_companion/taldor_echoes_of_glory/ogl.txt
    M pathfinder/paizo/player_companion/taldor_echoes_of_glory/teog_abilities_traits.lst
    M pathfinder/paizo/player_companion/taldor_echoes_of_glory/teog_equip.lst
    M pathfinder/paizo/player_companion/taldor_echoes_of_glory/teog_feats.lst
    A pathfinder/super_genius_games/inquisitors_judgments/OGL.txt
    A pathfinder/super_genius_games/inquisitors_judgments/aoij.jpg
    A pathfinder/super_genius_games/inquisitors_judgments/aoij.pcc
    A pathfinder/super_genius_games/inquisitors_judgments/aoij_abilities_class.lst
    A pathfinder/super_genius_games/inquisitors_judgments/aoij_abilitycategories.lst
    A pathfinder/super_genius_games/inquisitors_judgments/aoij_classes.lst
    A pathfinder/super_genius_games/inquisitors_judgments/aoij_feats.lst

  Log Message:
  -----------
  Fix conflict


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

  Changed paths:
    M pathfinder/paizo/player_companion/people_of_the_stars/_people_of_the_stars.pcc
    A pathfinder/paizo/player_companion/people_of_the_stars/pots_abilities_class.lst
    A pathfinder/paizo/player_companion/people_of_the_stars/pots_abilities_race.lst
    M pathfinder/paizo/player_companion/people_of_the_stars/pots_abilitycategories.lst
    M pathfinder/paizo/player_companion/people_of_the_stars/pots_deities.lst
    M pathfinder/paizo/player_companion/people_of_the_stars/pots_domains.lst
    M pathfinder/paizo/player_companion/people_of_the_stars/pots_equip.lst
    M pathfinder/paizo/player_companion/people_of_the_stars/pots_languages.lst
    M pathfinder/paizo/player_companion/people_of_the_stars/pots_races.lst
    M pathfinder/paizo/player_companion/people_of_the_stars/pots_templates.lst

  Log Message:
  -----------
  Merge pull request #66 from LegacyKing/NEWSOURCE-232

Newsource 232


Compare: https://github.com/PCGen/pcgen-newsources/compare/52bc4b7484fb...5bfec1807c4c