This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository lima. See http://git.chorem.org/lima.git commit acf87ab6a70870dcaba9b2a4bd97264bd56ca01c Merge: 807085c d0e4e99 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri May 29 10:58:52 2015 +0200 Merge branch 'feature/1229' into develop lima-swing/pom.xml | 1 + .../AccountCondition/AccountConditionHandler.java | 8 ++ .../AccountCondition/AccountConditionView.css | 8 +- .../AccountCondition/AccountConditionView.jaxx | 11 ++- .../lima/ui/celleditor/AccountTableCellEditor.java | 70 ++++------------ .../chorem/lima/ui/combobox/AccountComboBox.java | 70 ++++++++++++++++ .../lima/ui/combobox/AccountComboBoxModel.java | 98 ---------------------- .../lima/ui/common/AccountComboBoxModel.java | 54 ------------ .../org/chorem/lima/ui/lettering/LetteringView.css | 4 +- .../chorem/lima/ui/lettering/LetteringView.jaxx | 8 +- .../lima/ui/lettering/LetteringViewHandler.java | 64 ++++++++------ pom.xml | 2 +- 12 files changed, 147 insertions(+), 251 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.