diff options
author | Karolin Seeger <kseeger@samba.org> | 2008-02-29 10:44:38 +0100 |
---|---|---|
committer | Karolin Seeger <kseeger@samba.org> | 2008-02-29 10:44:38 +0100 |
commit | c4fbe2846231a6b322c1094c6a1dbf93b7305768 (patch) | |
tree | 09eb77a294f4acda131b41fe4c9bec4ed175eb16 /source3/include/MacExtensions.h | |
parent | 1a6415fc77c708b87c8e2ce6e7828f486ffc87ac (diff) | |
parent | 695b6662abe64a40061bfa05ede12173fc4b1945 (diff) | |
download | samba-c4fbe2846231a6b322c1094c6a1dbf93b7305768.tar.gz samba-c4fbe2846231a6b322c1094c6a1dbf93b7305768.tar.bz2 samba-c4fbe2846231a6b322c1094c6a1dbf93b7305768.zip |
Merge commit 'origin/v3-2-test' into v3-2-stable
Conflicts:
WHATSNEW.txt
(This used to be commit a390bcf9403df4cf4d5eef42b35ebccbe253882e)
Diffstat (limited to 'source3/include/MacExtensions.h')
-rw-r--r-- | source3/include/MacExtensions.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/include/MacExtensions.h b/source3/include/MacExtensions.h index 006b814037..6e911feea2 100644 --- a/source3/include/MacExtensions.h +++ b/source3/include/MacExtensions.h @@ -235,7 +235,7 @@ enum { ** that contains the icon data, icon size, icon type, the file type, and file creator. ** ** -** The server returns only that the call was succesfull or not. +** The server returns only that the call was successful or not. */ #define SMB_MAC_DT_ADD_ICON 0x309 |