aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Thought of a better way to copy folder tree state.Matthew Barnes2009-06-1412-82/+162
* Clean up EMFolderTreeModel.Matthew Barnes2009-06-146-364/+424
* Use key files for tracking widget states.Matthew Barnes2009-06-1329-773/+1022
* Makefile.am cleanups.Matthew Barnes2009-06-133-16/+4
* Bug 585554 – Opening PDF attachment crashes in e_attachment_open_handle_err...Matthew Barnes2009-06-131-30/+17
* Merge branch 'master' into kill-bonoboMatthew Barnes2009-06-090-0/+0
|\
| * Fix a runtime warning for zero-length attachments.Matthew Barnes2009-06-091-4/+8
| * Added entries for Oriya TranslationManoj Kumar Giri2009-06-091-0/+4
| * Updated Oriya TranslationManoj Kumar Giri2009-06-091-51/+58
| * Fix build on Windows: link with needed libraries.Tor Lillqvist2009-06-091-0/+2
| * Added entries for Oriya Translation update.Manoj Kumar Giri2009-06-051-0/+4
| * Updated Oriya Translation.Manoj Kumar Giri2009-06-051-1758/+1668
| * Avoid the console popping while evolution running on windowsFridrich Strba2009-06-053-0/+12
| * Fix even more compiler warnings and disable one for format stringsMilan Crha2009-06-0519-66/+70
| * libevolution-mail-shared is a new library, so reflect its existenceFridrich Strba2009-06-055-3/+543
| * Regenerate the def files according to the current state of the realFridrich Strba2009-06-055-594/+160
| * Bug #362907 - Give icons to Drafts/Sent/Templates foldersMilan Crha2009-06-051-3/+28
| * Added Entries for Oriya Translation.Manoj Kumar Giri2009-06-041-0/+4
| * Updated Oriya TranslationManoj Kumar Giri2009-06-041-7/+8
| * Fix Anjal's composer path.Srinivasa Ragavan2009-06-041-1/+2
| * Bug 584733 – Cannot create new accountSrinivasa Ragavan2009-06-041-15/+18
| * Updated Spanish translationJorge Gonzalez2009-06-041-26/+28
| * Bug #581780 - Remember passwords in keyring for web calendars tooMilan Crha2009-06-041-9/+75
| * Don't declare x_mailer "extern" because it causes undefined symbolsFridrich Strba2009-06-041-1/+1
| * Cater for circular dependencies between libevolution-mailFridrich Strba2009-06-041-0/+6
| * Add libraries to LIBADD so that -no-undefined on win32 works well.Fridrich Strba2009-06-043-4/+29
| * Remove a horrible hack and stuff the localizable strings into if-zero-ed blockFridrich Strba2009-06-041-16/+22
| * Whoops, forgot to remove a debug message.Matthew Barnes2009-06-041-2/+0
| * Bug 572543 – Doesn't show correct application for pdf attachmentsMatthew Barnes2009-06-042-6/+9
| * Anjal stuff's for Evo.Srinivasa Ragavan2009-06-035-11/+31
| * Add option for Sender/Addresses contain.Srinivasa Ragavan2009-06-031-4/+30
| * More Anjal stuff for trunk.Srinivasa Ragavan2009-06-032-1/+25
| * It might help to install the evolution binary.Matthew Barnes2009-06-031-8/+1
| * Remove libgnome includeFridrich Strba2009-06-031-1/+0
| * Replace libgnome function with equivalent glib functions.Fridrich Strba2009-06-031-1/+2
| * Updated Spanish translationJorge Gonzalez2009-06-031-124/+127
| * Updated Spanish translationJorge Gonzalez2009-06-031-1/+1
| * Updated Spanish translationJorge Gonzalez2009-06-031-571/+538
| * Bug 581280 – Wrong attachment name in eventMatthew Barnes2009-06-033-82/+472
| * Fix distcheck errors.Matthew Barnes2009-06-031-7/+3
| * Bug 582939 – Drop support for CDEMatthew Barnes2009-06-0322-1587/+1
| * Add MAINTAINERCLEANFILES based on Pango.Matthew Barnes2009-06-022-9/+23
| * Use standard C types in iconv-detect.cMatthew Barnes2009-06-021-9/+9
| * Fix more compiler warnings.Matthew Barnes2009-06-023-38/+2
| * More code cleanup.Matthew Barnes2009-06-02270-992/+992
| * Part of bug #574940 - Do not use freed memory in EMFolderView/BrowserMilan Crha2009-06-021-1/+5
| * Bug #337082 - Do not produce unnamed folders in a folder treeMilan Crha2009-06-021-4/+6
| * Part of bug #580212 - Report inline parts only when found both tagsMilan Crha2009-06-021-0/+3
| * Bug 323037 – Folder emblem to show new mail arrivalMilan Crha2009-06-013-19/+97
| * Update the address of the FSFTobias Mueller2009-05-314-7/+7
| * Small updateGabor Kelemen2009-05-311-1/+1
| * Updated Danish translationAsk H. Larsen2009-05-311-5003/+5272
| * Fix libevolution-mail-shared.laMatthew Barnes2009-05-301-17/+29
| * Bug 583446 – refresh folder hookLucian Langa2009-05-292-2/+10
| * Bug 584154 – custom icon folder hook does not workLucian Langa2009-05-293-4/+11
| * Fix whitespace errors in mail/Makefile.amMatthew Barnes2009-05-291-3/+3
| * Bug 583991 – "Suggest automatic display of attachment" does not workMatthew Barnes2009-05-291-0/+1
| * Whitespace cleanup.Matthew Barnes2009-05-29239-1040/+1040
| * Prefer GLib basic types over C types.Matthew Barnes2009-05-29799-13634/+13634
| * Remove trailing whitespace, again.Matthew Barnes2009-05-291096-1793/+1793
| * Bug #583441 - bbdb plugin is getting information from composer nowMilan Crha2009-05-281-27/+31
| * Bug #535516 - Crash in GConf Bridge while replyingMilan Crha2009-05-281-10/+16
| * Bug #540269 - Do not crash in em_format_is_attachmentMilan Crha2009-05-271-0/+3
| * Updated Spanish translationJorge Gonzalez2009-05-271-229/+170
* | Remove ESearchBar and EFilterBar.Matthew Barnes2009-06-094-2721/+0
* | Fix whitespace errors in mail/Makefile.amMatthew Barnes2009-06-092-2/+2
* | Added Entries for Oriya Translation.Manoj Kumar Giri2009-06-091-0/+4
* | Avoid the console popping while evolution running on windowsFridrich Strba2009-06-093-0/+12
* | Fix even more compiler warnings and disable one for format stringsMilan Crha2009-06-0917-63/+66
* | libevolution-mail-shared is a new library, so reflect its existenceFridrich Strba2009-06-094-0/+546
* | Regenerate the def files according to the current state of the realFridrich Strba2009-06-095-594/+160
* | Bug #362907 - Give icons to Drafts/Sent/Templates foldersMilan Crha2009-06-091-2/+29
* | Search bar improvements.Matthew Barnes2009-06-0913-91/+612
* | Updated Spanish translationJorge Gonzalez2009-06-041-26/+28
* | Updated Spanish translationJorge Gonzalez2009-06-041-124/+127
* | Updated Spanish translationJorge Gonzalez2009-06-041-1/+1
* | Updated Spanish translationJorge Gonzalez2009-06-041-571/+538
* | Fix a runtime warning for zero-length attachments.Matthew Barnes2009-06-041-4/+8
* | Bug #581780 - Remember passwords in keyring for web calendars tooMilan Crha2009-06-041-9/+75
* | Whoops, forgot to remove a debug message.Matthew Barnes2009-06-041-2/+0
* | Bug 572543 – Doesn't show correct application for pdf attachmentsMatthew Barnes2009-06-042-6/+9
* | Remove libgnome includeFridrich Strba2009-06-041-1/+0
* | Replace libgnome function with equivalent glib functions.Fridrich Strba2009-06-041-1/+2
* | Use GtkEntry instead of EIconEntry in the main search bar.Matthew Barnes2009-06-044-692/+127
* | It might help to install the evolution binary.Matthew Barnes2009-06-041-8/+1
* | Fix crash when printing an email.Matthew Barnes2009-06-031-0/+8
* | Bug 581280 – Wrong attachment name in eventMatthew Barnes2009-06-033-82/+472
* | Fix distcheck errors.Matthew Barnes2009-06-031-7/+3
* | Bug 582939 – Drop support for CDEMatthew Barnes2009-06-0322-1587/+1
* | Add MAINTAINERCLEANFILES based on Pango.Matthew Barnes2009-06-032-9/+23
* | Fix build break.Matthew Barnes2009-06-021-1/+1
* | Updated Spanish translationJorge Gonzalez2009-06-021-229/+170
* | Bug #540269 - Do not crash in em_format_is_attachmentMilan Crha2009-06-021-0/+3
* | Bug 584154 – custom icon folder hook does not workLucian Langa2009-06-023-4/+11
* | Updated Danish translationAsk H. Larsen2009-06-021-5003/+5272
* | Small updateGabor Kelemen2009-06-021-1/+1
* | Update the address of the FSFTobias Mueller2009-06-024-7/+7
* | Part of bug #580212 - Report inline parts only when found both tagsMilan Crha2009-06-021-0/+3
* | Bug #337082 - Do not produce unnamed folders in a folder treeMilan Crha2009-06-021-4/+6
* | More code cleanup.Matthew Barnes2009-06-02249-899/+899
* | Fix more compiler warnings.Matthew Barnes2009-06-023-38/+2
* | Branch maintenance.Matthew Barnes2009-06-022-8/+10
* | Bug 323037 – Folder emblem to show new mail arrivalMilan Crha2009-06-013-19/+97
* | Bug 583991 – "Suggest automatic display of attachment" does not workMatthew Barnes2009-05-291-0/+1
* | Whitespace cleanup.Matthew Barnes2009-05-29213-997/+997
* | Bug #583441 - bbdb plugin is getting information from composer nowMilan Crha2009-05-291-26/+30
* | Bug #535516 - Crash in GConf Bridge while replyingMilan Crha2009-05-291-9/+15
* | Get the mailer's URI popup menu working.Matthew Barnes2009-05-2811-418/+717
* | Prefer GLib basic types over C types.Matthew Barnes2009-05-27705-11979/+11979
* | Merge branch 'master' into kill-bonoboMatthew Barnes2009-05-271239-16597/+17613
|\ \
| * | Remove trailing whitespace, again.Matthew Barnes2009-05-271096-1795/+1795
| |/
| * Fix composer header regression caused by Anjal merge.Matthew Barnes2009-05-274-21/+22
| * Remove Attach toolbar button from composer.Matthew Barnes2009-05-271-1/+0
| * Merge branch 'warnings'Matthew Barnes2009-05-27227-1253/+1243
| |\
| | * Fix compiler warnings in plugins.Matthew Barnes2009-05-2745-162/+186
| | * Fix compiler warnings in mail.Matthew Barnes2009-05-2639-403/+419
| | * Fix compiler warnings in addressbook.Matthew Barnes2009-05-2621-106/+106
| | * Fix compiler warnings in calendar.Matthew Barnes2009-05-2650-316/+324
| | * Fix compiler warnings in smime.Matthew Barnes2009-05-263-2/+4
| | * Fix compiler warnings in composer.Matthew Barnes2009-05-263-8/+1
| | * Fix compiler warnings in filter.Matthew Barnes2009-05-264-5/+3
| | * Fix compiler warnings in shell.Matthew Barnes2009-05-265-10/+13
| | * Fix compiler warnings in widgets.Matthew Barnes2009-05-2652-181/+131
| | * Fix compiler warnings in e-util.Matthew Barnes2009-05-2612-60/+56
| * | Updated Hebrew translationYaron Shahrabani2009-05-261-6527/+5768
| * | Bug #578335 - CalDAV - replace '@' in username to "%40"Milan Crha2009-05-251-9/+46
| * | itip-formatter - search for master object tooMilan Crha2009-05-251-3/+5
| |/
| * Post-release version bump.Matthew Barnes2009-05-251-1/+1
| * ** Evolution 2.27.2 ReleasedMatthew Barnes2009-05-251-0/+54
| * Updated Tamil translationdrtvasudevan2009-05-251-4894/+3467
| * Add very strict compiler warning flags.Matthew Barnes2009-05-252-15/+89
| * Remove obsolete dialog from mail-dialogs.glade.Matthew Barnes2009-05-251-1499/+908
| * Use named icons in the folder tree instead of pixbufs.Matthew Barnes2009-05-255-117/+107
| * Eliminate redundant E_ICON_SIZE_* enumeration.Matthew Barnes2009-05-2429-254/+186
| * Prefer icons from GTK's cache instead of our own.Matthew Barnes2009-05-241-4/+6
| * Updated Spanish translationJorge Gonzalez2009-05-241-591/+835
| * Fix "make check" errors.Matthew Barnes2009-05-241-1/+3
| * Updated Spanish translationJorge Gonzalez2009-05-241-9/+5
| * Updated Thai translation.Theppitak Karoonboonyanan2009-05-241-7/+7
| * Added figures for Greek documentationMarios Zindilis2009-05-2356-0/+0
| * Mail changes required for Anjal.Srinivasa Ragavan2009-05-2210-95/+378
| * Filter/Search bar changes for Anjal.Srinivasa Ragavan2009-05-226-56/+134
| * Johnny's composer changes for Anjal.Srinivasa Ragavan2009-05-2212-29/+320
| * Install filter/ headers to filter/ for Anjal's usage.Srinivasa Ragavan2009-05-221-0/+16
| * Fix EConfig bugs for Anjal's account setup.Srinivasa Ragavan2009-05-221-9/+12
| * Updated Greek translation for documentationMarios Zindilis2009-05-221-1440/+4039
| * Adding the new file which was missed in earlier commit for resend feature.Chenthill Palanisamy2009-05-221-0/+44
| * Updated Spanish translationJorge Gonzalez2009-05-221-3/+3
| * Updated Spanish translationJorge Gonzalez2009-05-221-324/+390
* | Fix "make check" errors.Matthew Barnes2009-05-252-93/+114
* | Eliminate redundant E_ICON_SIZE_* enumeration.Matthew Barnes2009-05-2518-118/+50
* | Prefer icons from GTK's cache instead of our own.Matthew Barnes2009-05-251-4/+6
* | Johnny's composer changes for Anjal.Srinivasa Ragavan2009-05-2412-29/+281
* | Filter/Search bar changes for Anjal.Srinivasa Ragavan2009-05-247-112/+462
* | Mail changes required for Anjal.Srinivasa Ragavan2009-05-2412-44/+319
* | Install filter/ headers to filter/ for Anjal's usage.Srinivasa Ragavan2009-05-241-0/+16
* | Fix EConfig bugs for Anjal's account setup.Srinivasa Ragavan2009-05-241-9/+12
* | Fix some account UI glitches.Matthew Barnes2009-05-242-2/+12
* | Bug 583339 – Edit->Preferences->Mail Accounts inconsistentMatthew Barnes2009-05-2414-2419/+2838
* | Fix what I assume are some merge errors.Matthew Barnes2009-05-225-35/+40
* | Merge branch 'master' into kill-bonoboMatthew Barnes2009-05-2239-57/+54
|\|
| * Bug 523216 – User-oriented plugin descriptionsMatthew Barnes2009-05-2242-62/+59
* | Merge branch 'master' into kill-bonoboMatthew Barnes2009-05-2247-982/+3862
|\|
| * Update Win32 symbol export files.Matthew Barnes2009-05-217-10/+2793
| * Relegate the "face" plugin to experimentalMatthew Barnes2009-05-211-2/+2
| * Rename configure.in to configure.ac.Matthew Barnes2009-05-212-1/+1
| * Bug #579779 - No crash when updating repeating eventMilan Crha2009-05-211-2/+1
| * Bug #583360 - Be able to select UTC as day view's second timezoneMilan Crha2009-05-211-1/+9
| * Show a progress message if the calendar is taking sometime to open.Chenthill Palanisamy2009-05-211-2/+5
| * Fixes bug 498712 (bnc) - deleting meetings sometimes does not work properly.Chenthill Palanisamy2009-05-214-13/+10
| * Adds the resend feature to GroupWise features.Chenthill Palanisamy2009-05-217-29/+281
| * Fixes bug 499107 (bnc) - delete all the recurring instances from the folder.Chenthill Palanisamy2009-05-211-2/+10
| * Bug 580925 – Better search bar for word searchesMatthew Barnes2009-05-2118-414/+1013
| * Merge branch 'vcard-inline'Matthew Barnes2009-05-219-553/+343
| |\
| | * Use proper ngettext support in vcard-inline.cMatthew Barnes2009-05-211-2/+5
| | * Remove generated files from git.Matthew Barnes2009-05-063-61/+0
| | * Remove auto-generated files from git.Matthew Barnes2009-05-062-1428/+0
| | * Merge branch 'master' into vcard-inlineMatthew Barnes2009-05-062-11/+32
| | |\
| | * | Make vcard-inline actually work.Matthew Barnes2009-05-067-52/+10
| | * | Merge branch 'master' into vcard-inlineMatthew Barnes2009-05-061-2/+2
| | |\ \
| | * | | Convert the vCard Bonobo control to an EMFormatHook plugin.Matthew Barnes2009-05-0618-553/+1871
| * | | | Merge branch '274117-compoer-view-fields'Matthew Barnes2009-05-2117-781/+511
| |\ \ \ \
| | * | | | Bug 274117 – Difficult to post a new message to newsgroupsMatthew Barnes2009-05-2117-781/+511
| * | | | | Updated Spanish translationJorge Gonzalez2009-05-191-247/+209
| |/ / / /
| * | | | Add e-attachment-handler-sendto.c to POTFILES.in.Matthew Barnes2009-05-171-0/+1
| * | | | Fix compiler warnings.Matthew Barnes2009-05-173-18/+5
| * | | | Bug 578176 – "Send message to contact" does not honor "always BCC"Matthew Barnes2009-05-171-3/+5
| * | | | Bug 582744 – CC field autofill doesn't work for repliesMatthew Barnes2009-05-175-8/+82
| * | | | Move automatic CC/BCC handling to EComposerHeaderTable.Matthew Barnes2009-05-172-93/+99
| * | | | Bug 578478 – Composer shows not all "From" informationMatthew Barnes2009-05-171-1/+1
| * | | | Fix several types of pedantic compiler warnings.Matthew Barnes2009-05-17109-187/+160
| * | | | Bug 458491 – Remove useless "Call To..." popup menu optionMatthew Barnes2009-05-153-9/+1
| * | | | Bug 582626 - Remove forgotten widgets from a glade fileMilan Crha2009-05-151-36/+0
| * | | | Add e_attachment_store_get_attachments().Matthew Barnes2009-05-152-34/+44
| * | | | Bug 582585 – Crash when deleting multiple attachments from composed mailMatthew Barnes2009-05-141-0/+6
| * | | | Remove an unnecessary variable from get_attachment_list().Matthew Barnes2009-05-141-3/+1
| * | | | Make the Calendar view scroll using the arrow keysMarcel Stimberg2009-05-141-17/+74
| * | | | Bug 582144 – Evolution not showing proper attachment filenameMatthew Barnes2009-05-132-9/+14
| * | | | Bug 581424 - Personal folder tree appears besides Public folder in subscripti...Johnny Jacob2009-05-131-1/+2
| * | | | Bug 440919 – Evolution can't attach "zero length" filesMatthew Barnes2009-05-131-0/+10
| * | | | Bug 582168 – Remove duplicated shebang and comment from autogen.shDamien Lespiau2009-05-111-3/+0
* | | | | Kill obsolete menu items.Matthew Barnes2009-05-215-258/+0
* | | | | Fix a compiler warning.Matthew Barnes2009-05-211-13/+14
* | | | | Fix compiler warnings.Matthew Barnes2009-05-213-18/+5
* | | | | Bug 582744 – CC field autofill doesn't work for repliesMatthew Barnes2009-05-215-8/+82
* | | | | Move automatic CC/BCC handling to EComposerHeaderTable.Matthew Barnes2009-05-212-93/+99
* | | | | Bug 578478 – Composer shows not all "From" informationMatthew Barnes2009-05-211-1/+1
* | | | | Fix several types of pedantic compiler warnings.Matthew Barnes2009-05-2194-161/+142
* | | | | Remove useless "Call To..." popup menu option.Matthew Barnes2009-05-211-15/+0
* | | | | Bug 458491 – Remove useless "Call To..." popup menu optionMatthew Barnes2009-05-213-9/+1
* | | | | Bug 582626 - Remove forgotten widgets from a glade fileMilan Crha2009-05-211-36/+0
* | | | | Add e_attachment_store_get_attachments().Matthew Barnes2009-05-212-34/+44
* | | | | Bug 582585 – Crash when deleting multiple attachments from composed mailMatthew Barnes2009-05-211-0/+6
* | | | | Remove an unnecessary variable from get_attachment_list().Matthew Barnes2009-05-211-3/+1
* | | | | Make the Calendar view scroll using the arrow keysMarcel Stimberg2009-05-211-17/+74
* | | | | Bug 582144 – Evolution not showing proper attachment filenameMatthew Barnes2009-05-212-9/+14
* | | | | Bug 581424 - Personal folder tree appears besides Public folder in subscripti...Johnny Jacob2009-05-211-1/+2
* | | | | Bug 440919 – Evolution can't attach "zero length" filesMatthew Barnes2009-05-211-0/+10
* | | | | Bug 582168 – Remove duplicated shebang and comment from autogen.shDamien Lespiau2009-05-211-3/+0
* | | | | Use -no-undefined on Linux tooMilan Crha2009-05-20187-696/+601
* | | | | Merge branch 'master' into kill-bonoboMatthew Barnes2009-05-114-700/+613
|\| | | |
| * | | | Resize the alarm notifier correctlyRitesh Khadgaray2009-05-091-1/+1
| * | | | Updating Estonian translationIvar Smolin2009-05-091-32/+11
| * | | | Updated Spanish translationJorge Gonzalez2009-05-091-359/+393
| * | | | Updated Oriya Translation.Manoj Kumar Giri2009-05-071-308/+208
* | | | | Make the mail module resident until we can split it up.Matthew Barnes2009-05-111-0/+13
* | | | | Add G_MODULE_EXPORT to exported module functions.Matthew Barnes2009-05-114-8/+8
* | | | | Fix a compiler warning.Matthew Barnes2009-05-111-1/+1
* | | | | Fudge translation issues in be.po.Matthew Barnes2009-05-111-14/+14
* | | | | Use the proper idiom for loading types in a GTypeModule.Matthew Barnes2009-05-1179-791/+919
* | | | | Fix bugs caused by EShellBackend changes.Matthew Barnes2009-05-1020-272/+411
* | | | | Adapt tasks to EShellBackend changes.Matthew Barnes2009-05-0917-206/+494
* | | | | Adapt memos to EShellBackend changes.Matthew Barnes2009-05-0911-94/+236
* | | | | Adapt calendar to EShellBackend changes.Matthew Barnes2009-05-0833-310/+542
* | | | | Fix most of the compiler warnings in mail.Matthew Barnes2009-05-0813-41/+80
* | | | | Adapt mail to EShellBackend changes.Matthew Barnes2009-05-0850-670/+909
* | | | | Adapt addressbook to EShellBackend changes.Matthew Barnes2009-05-0713-188/+190
* | | | | Convert EShellModule to EShellBackendMatthew Barnes2009-05-0730-1218/+1489
* | | | | Merge branch 'master' into kill-bonoboMatthew Barnes2009-05-0713-915/+691
|\| | | |
| * | | | Bug 580900 – Kill libgnomeui/gnome-dateeditAdam Petaccia2009-05-073-38/+0
| * | | | Bug 571496 – Migrate from deprecated gnome_execute to g_spawn/xdg-terminalAdam Petaccia2009-05-066-30/+19
| * | | | Updated Oriya Translation.Manoj Kumar Giri2009-05-061-17/+8
| * | | | Updated Oriya Translation.Manoj Kumar Giri2009-05-061-356/+212
| | |_|/ | |/| |
| * | | 2009-05-06 Jeff Cai <jeff.cai@sun.com>Jeff Cai2009-05-062-11/+32
| | |/ | |/|
| * | Fix a couple attachment drag-and-drop typos.Matthew Barnes2009-05-061-2/+2
| |/
| * Use 'Open with "$foo"' instead of 'Open in $foo...'Matthew Barnes2009-05-061-1/+1
| * Bug 581454 – Move nautilus-sendto integration to EvolutionMatthew Barnes2009-05-064-0/+314
| * Updated Norwegian bokmål translation.Kjartan Maraas2009-05-061-480/+434
* | Not sure how that file got lost...Matthew Barnes2009-05-071-0/+26065
* | Use 'Open with "$foo"' instead of 'Open in $foo...'Matthew Barnes2009-05-061-1/+1