diff options
| author | Leif Åstrand <leif@vaadin.com> | 2011-11-08 17:36:53 +0200 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2011-11-08 17:36:53 +0200 |
| commit | 3159f00229ba88797142c8888d7a68344371dae7 (patch) | |
| tree | 3b597fd8c5a35cc44c89597ca76c0062255daeea /build | |
| parent | 33f6d6e23d7d52368db993ae7f5b105e8f369dfe (diff) | |
| parent | 2eff8c02aba3d9dc0dd74b0aff9c114a3dc29201 (diff) | |
| download | vaadin-framework-3159f00229ba88797142c8888d7a68344371dae7.tar.gz vaadin-framework-3159f00229ba88797142c8888d7a68344371dae7.zip | |
Merge branch 'master' into windowing
Diffstat (limited to 'build')
| -rw-r--r--[-rwxr-xr-x] | build/bin/closed-to-rn.py | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | build/bin/mergetool.py | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | build/bin/package-diff.py | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | build/bin/svnlog-to-rn.py | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | build/bin/tagrelease.py | 0 | ||||
| -rw-r--r-- | build/build.xml | 3 | ||||
| -rw-r--r--[-rwxr-xr-x] | build/cssoptimizer/cssoptimizer | bin | 52888 -> 52888 bytes |
7 files changed, 2 insertions, 1 deletions
diff --git a/build/bin/closed-to-rn.py b/build/bin/closed-to-rn.py index 0928877e1c..0928877e1c 100755..100644 --- a/build/bin/closed-to-rn.py +++ b/build/bin/closed-to-rn.py diff --git a/build/bin/mergetool.py b/build/bin/mergetool.py index c22fd952bc..c22fd952bc 100755..100644 --- a/build/bin/mergetool.py +++ b/build/bin/mergetool.py diff --git a/build/bin/package-diff.py b/build/bin/package-diff.py index f3b0d59562..f3b0d59562 100755..100644 --- a/build/bin/package-diff.py +++ b/build/bin/package-diff.py diff --git a/build/bin/svnlog-to-rn.py b/build/bin/svnlog-to-rn.py index 5cca3705f9..5cca3705f9 100755..100644 --- a/build/bin/svnlog-to-rn.py +++ b/build/bin/svnlog-to-rn.py diff --git a/build/bin/tagrelease.py b/build/bin/tagrelease.py index 8745553596..8745553596 100755..100644 --- a/build/bin/tagrelease.py +++ b/build/bin/tagrelease.py diff --git a/build/build.xml b/build/build.xml index 0cad5b436e..9acb1045dd 100644 --- a/build/build.xml +++ b/build/build.xml @@ -948,7 +948,8 @@ > <filter includes="com.vaadin.*" /> <filter excludes="com.vaadin.tests.*" /> - <filter excludes="com.vaadin.terminal.gwt.*" /> + <filter excludes="com.vaadin.terminal.gwt.client.*" /> + <filter excludes="com.vaadin.terminal.gwt.widgetsetutils.*" /> <filter excludes="*Test*" /> <filter excludes="com.vaadin.launcher.*" /> </instr> diff --git a/build/cssoptimizer/cssoptimizer b/build/cssoptimizer/cssoptimizer Binary files differindex ff0e49b4a3..ff0e49b4a3 100755..100644 --- a/build/cssoptimizer/cssoptimizer +++ b/build/cssoptimizer/cssoptimizer |