From: Jouni Koivuviita <jouni.koivuviita@itmill.com>
Date: Wed, 8 Apr 2009 13:16:16 +0000 (+0000)
Subject: Merges from 6.0 branch.
X-Git-Tag: 6.7.0.beta1~2936^2~17
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9981d776a916d059b7033fa236dc0e41b2440e01;p=vaadin-framework.git

Merges from 6.0 branch.

svn changeset:7370/svn branch:theme_2009_03
---

9981d776a916d059b7033fa236dc0e41b2440e01
diff --cc build/build.properties
index 3580fe286d,7ae42f9f23..9208f4ed92
--- a/build/build.properties
+++ b/build/build.properties
@@@ -2,6 -3,6 +3,6 @@@ checkout-path=build/checkou
  product-file=itmill-toolkit
  product-name=IT Mill Toolkit
  toolkit-package=com/itmill/toolkit
--eclipse-workspace-name=itmill-toolkit-examples
++eclipse-workspace-name=vaadin-6-theme
  eclipse-launch-vmargs=-Xms256M -Xmx512M
--gwt-dir=build/gwt
++gwt-dir=build/gwt/gwt