[Pcgen-github] [PCGen/pcgen] 9fd95f: Fix orphan

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

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

  Changed paths:
    M data/darwins_world_2/rpg_objects/darwins_world_2/survivors_guide/dw2sg_equip_arms_armor.lst
    R data/darwins_world_2/rpg_objects/darwins_world_2/survivors_guide/dw2sg_equip_weap.lst

  Log Message:
  -----------
  Fix orphan


  Commit: 5a4dfaeada1101f93f05d0c60361bf07ab554c53
      https://github.com/PCGen/pcgen/commit/5a4dfaeada1101f93f05d0c60361bf07ab554c53
  Author: Andrew Maitland <dre...@ya...>
  Date:   2015-01-10 (Sat, 10 Jan 2015)

  Changed paths:
    M data/darwins_world_2/rpg_objects/darwins_world_2/survivors_guide/dw2sg_equip_arms_armor.lst
    R data/darwins_world_2/rpg_objects/darwins_world_2/survivors_guide/dw2sg_equip_weap.lst

  Log Message:
  -----------
  Merge pull request #58 from LegacyKing/patch_Jenkins

Fix orphan


Compare: https://github.com/PCGen/pcgen/compare/c1eb82e25df6...5a4dfaeada11