Merge branch 'reports'
authorMurray Cumming <murrayc@murrayc.com>
Thu, 19 Apr 2012 12:08:14 +0000 (14:08 +0200)
committerMurray Cumming <murrayc@murrayc.com>
Thu, 19 Apr 2012 12:16:38 +0000 (14:16 +0200)
commite34770b1d3f361de59f8ae1e7a4801874bb4f603
treec0fa56ce43e98e2991204faa40e61c3f033c918e
parent7f530c877277cad2a50dbdad601049c3142f6c61
parent106ae69fe57bb172f39961dee248008ea6396eee
Merge branch 'reports'

Conflicts:
ChangeLog
pom.xml
src/main/java/org/glom/web/OnlineGlom.gwt.xml
src/main/java/org/glom/web/client/activity/DetailsActivity.java
src/main/java/org/glom/web/client/activity/ListActivity.java
src/main/java/org/glom/web/client/activity/TableSelectionActivity.java
src/main/java/org/glom/web/client/place/HasTablePlace.java
src/main/java/org/glom/web/client/place/ListPlace.java
src/main/java/org/glom/web/client/ui/TableSelectionViewImpl.java
src/main/java/org/glom/web/server/OnlineGlomServiceImpl.java
src/main/resources/org/glom/web/client/ui/OnlineGlomConstants.properties
src/main/resources/org/glom/web/client/ui/OnlineGlomConstants_cs.properties
src/main/resources/org/glom/web/client/ui/OnlineGlomConstants_de.properties
src/main/resources/org/glom/web/client/ui/OnlineGlomConstants_es.properties
src/main/resources/org/glom/web/client/ui/OnlineGlomConstants_sl.properties
src/main/resources/org/glom/web/client/ui/OnlineGlomConstants_zh_CN.properties
ChangeLog
pom.xml
src/main/java/org/glom/web/server/OnlineGlomServiceImpl.java
src/main/webapp/style.css