Merge remote-tracking branch 'upstream/master' into group-data

2013-11-20 17:39:17 +01:00
parent aed0d7efe9 223383b692
commit 064e6d490b
6 changed files with 59 additions and 17 deletions
--- a/testdata/integration_tests/SCHEDULE/SCHEDULE1
+++ b/testdata/integration_tests/SCHEDULE/SCHEDULE1
@@ -4,7 +4,7 @@ START

 SCHEDULE

-DATES
+DATES      -- Bananskrell
  10  'JUN'  2007 /
 /

--- a/testdata/integration_tests/SCHEDULE/SCHEDULE_COMMENTS_AFTER_KEYWORDS
+++ b/testdata/integration_tests/SCHEDULE/SCHEDULE_COMMENTS_AFTER_KEYWORDS
@@ -0,0 +1,26 @@
+START
+10 MAI 2007 /
+
+
+SCHEDULE
+
+DATES -- Bananskrell
+  10  'JUN'  2007 /
+/
+
+
+DATES
+   10  JLY 2007 /
+   10  AUG 2007 /
+/      
+
+
+
+TSTEP -- Fiskepudding
+  10   2*10  /
+ 
+
+DATES
+   10  JLY 2008 /
+   10  AUG 2008 /
+/