Merge branch 'master' of git@github.com:plainblack/webgui

Conflicts: docs/changelog/7.x.x.txt
2009-09-15 20:17:31 -05:00 · 2009-09-15 20:17:31 -05:00 · af4eff37f9
commit af4eff37f9
parent ed8a0dac5c 694d54928e
3 changed files with 3 additions and 1 deletions
--- a/lib/WebGUI/Asset/Wobject/Calendar.pm
+++ b/lib/WebGUI/Asset/Wobject/Calendar.pm
@ -261,6 +261,7 @@ sub definition {
            defaultValue    => [],
            serialize       => 1,
            noFormPost      => 1,
+            autoGenerate    => 0,
            tab             => "display",
        },