[seam-commits] [seam/dist] f9ead7: Adding the new solder chapter

[noreply at github.com]

  Branch: refs/heads/master
  Home:   https://github.com/seam/dist

  Commit: f9ead7e8394d9e6a91c1524c4132e77eca4aa76d
      https://github.com/seam/dist/commit/f9ead7e8394d9e6a91c1524c4132e77eca4aa76d
  Author: LightGuard <lightguard.jp at gmail.com>
  Date:   2011-12-13 (Tue, 13 Dec 2011)

  Changed paths:
    M docs/src/main/docbook/en-US/bundled_master.xml

  Log Message:
  -----------
  Adding the new solder chapter


  Commit: ed1f15dabe3bd3269a94765fbb375e1ce8328ab1
      https://github.com/seam/dist/commit/ed1f15dabe3bd3269a94765fbb375e1ce8328ab1
  Author: LightGuard <lightguard.jp at gmail.com>
  Date:   2011-12-13 (Tue, 13 Dec 2011)

  Changed paths:
    M dist/pom.xml
  M dist/src/main/assembly/assembly.xml
  M docs/pom.xml
  M docs/src/main/docbook/en-US/bundled_master.xml

  Log Message:
  -----------
  Merge branch 'master' of github.com:seam/dist

Conflicts:
	docs/src/main/docbook/en-US/bundled_master.xml


Compare: https://github.com/seam/dist/compare/6b848c3...ed1f15d