diff options
author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2012-04-23 22:44:16 +0000 |
---|---|---|
committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2012-04-23 22:44:16 +0000 |
commit | f3c17241a42a0845eae2099e6970b5aca9bbd836 (patch) | |
tree | e511e108810d2b80f72ff6cee5efafba472beb6a /cups/notify.c | |
parent | 271780fb877d849c9f41616f338e1e9dd2d69409 (diff) | |
download | cups-f3c17241a42a0845eae2099e6970b5aca9bbd836.tar.gz |
Merge changes from CUPS 1.6svn-r10437.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3794 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'cups/notify.c')
-rw-r--r-- | cups/notify.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cups/notify.c b/cups/notify.c index b514c7db3..9d520f17d 100644 --- a/cups/notify.c +++ b/cups/notify.c @@ -3,7 +3,7 @@ * * Notification routines for CUPS. * - * Copyright 2007-2010 by Apple Inc. + * Copyright 2007-2012 by Apple Inc. * Copyright 2005-2006 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -33,7 +33,7 @@ * * The returned string must be freed by the caller using @code free@. * - * @since CUPS 1.2/Mac OS X 10.5@ + * @since CUPS 1.2/OS X 10.5@ */ char * /* O - Subject string or @code NULL@ */ @@ -164,7 +164,7 @@ cupsNotifySubject(cups_lang_t *lang, /* I - Language data */ * * The returned string must be freed by the caller using @code free@. * - * @since CUPS 1.2/Mac OS X 10.5@ + * @since CUPS 1.2/OS X 10.5@ */ char * /* O - Message text or @code NULL@ */ |