diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2009-01-22 19:16:10 +0000 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2009-01-22 19:16:10 +0000 |
| commit | ad401e02f0602dd9f0905ce290441b10e46ff75a (patch) | |
| tree | 6040b4f38e071999b9ef650b8abc0d082c768e45 /npc/functions | |
| parent | b33e9b4508101d7097ed684c7c3316cb48a4f995 (diff) | |
| parent | 96352cdf87009db08ca68a3c3deee577a981adb8 (diff) | |
| download | serverdata-ad401e02f0602dd9f0905ce290441b10e46ff75a.tar.gz serverdata-ad401e02f0602dd9f0905ce290441b10e46ff75a.tar.bz2 serverdata-ad401e02f0602dd9f0905ce290441b10e46ff75a.tar.xz serverdata-ad401e02f0602dd9f0905ce290441b10e46ff75a.zip | |
Merge commit 'origin/master' into magic
Diffstat (limited to 'npc/functions')
| -rw-r--r-- | npc/functions/barber.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/npc/functions/barber.txt b/npc/functions/barber.txt index 57c3c598..ceba8fd8 100644 --- a/npc/functions/barber.txt +++ b/npc/functions/barber.txt @@ -20,8 +20,8 @@ L_Style: "Center parting/Short and slick", -, "Long and slick", -, "Short and curly", -, - "Long and curly", -, "Pigtails", -, + "Long and curly", -, "Parted", -, "Supprise me", -, "Nah, I'm fine", L_Done; |