[zanata-commits] [zanata/zanata] 5cd4be: Merge branch 'master' of github.com:zanata/zanata

[noreply at github.com]

  Branch: refs/heads/1.4
  Home:   https://github.com/zanata/zanata

  Commit: 5cd4be2628410bf1994ecb62e28efda57b377df8
      https://github.com/zanata/zanata/commit/5cd4be2628410bf1994ecb62e28efda57b377df8
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-08-09 (Tue, 09 Aug 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableResources.java
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/crystal_project/_16x16/actions/3floppy_unmount.png
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/crystal_project/_16x16/actions/button_save.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/crystal_project/_16x16/actions/flag.png

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


  Commit: 20858a209c0d11e6ed24f461b429d45f39b38eff
      https://github.com/zanata/zanata/commit/20858a209c0d11e6ed24f461b429d45f39b38eff
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-08-09 (Tue, 09 Aug 2011)

  Changed paths:
    M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PushMojo.java

  Log Message:
  -----------
  fix bug where includes options ignore defined file extension type


  Commit: 7a67993648bafce9cc481d893c9aa2a9201672b4
      https://github.com/zanata/zanata/commit/7a67993648bafce9cc481d893c9aa2a9201672b4
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-08-09 (Tue, 09 Aug 2011)

  Changed paths:
    M client/pom.xml
  M client/zanata-adapter-po/pom.xml
  M client/zanata-adapter-properties/pom.xml
  M client/zanata-adapter-xliff/pom.xml
  M client/zanata-client-ant-po/pom.xml
  M client/zanata-client-ant-properties/pom.xml
  M client/zanata-client-commands/pom.xml
  M client/zanata-maven-plugin/pom.xml
  M common/pom.xml
  M common/zanata-common-api/pom.xml
  M common/zanata-common-util/pom.xml
  M common/zanata-rest-client/pom.xml
  M pom.xml
  M server/pom.xml
  M server/zanata-model/pom.xml
  M server/zanata-war/pom.xml
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/crystal_project/_16x16/actions/fuzzy.png
  M zanata-parent/pom.xml

  Log Message:
  -----------
  Merge branch '1.4' of github.com:zanata/zanata into 1.4


Compare: https://github.com/zanata/zanata/compare/35688fa...7a67993