[zanata/zanata] a1ccf2: Work in progress: plural support - cancel button

[GitHub]

  Branch: refs/heads/rhbz803572
  Home:   https://github.com/zanata/zanata
  Commit: a1ccf2cdc453317f5b9dd2d242251f696a5f68ab
      https://github.com/zanata/zanata/commit/a1ccf2cdc453317f5b9dd2d242251f696a5f68ab
  Author: Alex Eng <loones1595 at gmail.com>
  Date:   2012-03-22 (Thu, 22 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsDisplay.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java

  Log Message:
  -----------
  Work in progress: plural support - cancel button


  Commit: 584670ef84bb021cd51052ece4d69e5d55d76696
      https://github.com/zanata/zanata/commit/584670ef84bb021cd51052ece4d69e5d55d76696
  Author: Alex Eng <loones1595 at gmail.com>
  Date:   2012-03-22 (Thu, 22 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/InlineTargetCellEditor.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/events/OpenEditorEvent.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java

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

Conflicts:
	server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java


Compare: https://github.com/zanata/zanata/compare/3821843...584670e