| author | waspe <waspe> | 2003-11-03 18:28:50 (UTC) |
|---|---|---|
| committer | waspe <waspe> | 2003-11-03 18:28:50 (UTC) |
| commit | 87a9d6badcf518ffd14559ef886ff7729b63b73b (patch) (unidiff) | |
| tree | 05af57bcebb8a124c2561336e4ff3dfdd52aeccb /core/pim/datebook/datebookweeklst.h | |
| parent | 9ce566fd5b280622670cf7b0e158f9d9c54e6e9a (diff) | |
| download | opie-87a9d6badcf518ffd14559ef886ff7729b63b73b.zip opie-87a9d6badcf518ffd14559ef886ff7729b63b73b.tar.gz opie-87a9d6badcf518ffd14559ef886ff7729b63b73b.tar.bz2 | |
resolved merge conflict
Diffstat (limited to 'core/pim/datebook/datebookweeklst.h') (more/less context) (show whitespace changes)
| -rw-r--r-- | core/pim/datebook/datebookweeklst.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/pim/datebook/datebookweeklst.h b/core/pim/datebook/datebookweeklst.h index 0bfbcda..f683ce7 100644 --- a/core/pim/datebook/datebookweeklst.h +++ b/core/pim/datebook/datebookweeklst.h | |||
| @@ -121,4 +121,5 @@ public: | |||
| 121 | int week() const { return _week; }; | 121 | int week() const { return _week; }; |
| 122 | QDate date(); | 122 | QDate date(); |
| 123 | QDate weekDate() const; | ||
| 123 | 124 | ||
| 124 | public slots: | 125 | public slots: |