Merge remote-tracking branch 'origin/master' into design2015

Conflicts:
	java/com.sap.sailing.gwt.ui/SailingGWT.launch
This commit is contained in:
Steffen Schaefer committed 2015-07-14 08:05:29 +02:00
commit 149abed5bc
7 files changed
+22 -19

No files matched your search

@@ -44,7 +44,7 @@ import com.sap.sailing.selenium.core.SeleniumFieldDecorator;
* D049941
*/
public class PageObject {
public static final int DEFAULT_WAIT_TIMEOUT_SECONDS = 60;
public static final int DEFAULT_WAIT_TIMEOUT_SECONDS = 120;
public static final int DEFAULT_POLLING_INTERVAL = 5;