« Previous | Next » 

Revision 28d5bedc

ID28d5bedc914a7da5989b9fd321e9a9fb76cb2ffa
Parent b2e339cc, a82eb968
Child 9eb140e3

Added by Ruben S. Montero almost 8 years ago

Merge branch 'master' into feature-1712

Conflicts:
src/xml/expr_arith.cc
src/xml/expr_bool.cc
src/xml/expr_bool.h

Files

  • added
  • modified
  • copied
  • renamed
  • deleted