diff options
| author | Kenpachi2k13 <3476227+Kenpachi2k13@users.noreply.github.com> | 2020-05-03 09:14:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-03 09:14:56 +0200 |
| commit | cd593de68b02d77766fcb3b7b2a869096ceb7183 (patch) | |
| tree | 2245738ce70d50031b927fed560815458658c7c2 /npc/pre-re/merchants | |
| parent | f70a887b188dbd88c45c9992cd18a33b6886005f (diff) | |
| parent | f40cc839413cc82aed445d39cc3aa204dce87780 (diff) | |
| download | hercules-cd593de68b02d77766fcb3b7b2a869096ceb7183.tar.gz hercules-cd593de68b02d77766fcb3b7b2a869096ceb7183.tar.bz2 hercules-cd593de68b02d77766fcb3b7b2a869096ceb7183.tar.xz hercules-cd593de68b02d77766fcb3b7b2a869096ceb7183.zip | |
Merge branch 'master' into cell_noskill
Diffstat (limited to 'npc/pre-re/merchants')
| -rw-r--r-- | npc/pre-re/merchants/ammo_boxes.txt | 4 | ||||
| -rw-r--r-- | npc/pre-re/merchants/ammo_dealer.txt | 4 | ||||
| -rw-r--r-- | npc/pre-re/merchants/shops.txt | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/npc/pre-re/merchants/ammo_boxes.txt b/npc/pre-re/merchants/ammo_boxes.txt index 7ac527f89..3d40189e5 100644 --- a/npc/pre-re/merchants/ammo_boxes.txt +++ b/npc/pre-re/merchants/ammo_boxes.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/merchants/ammo_dealer.txt b/npc/pre-re/merchants/ammo_dealer.txt index 185caa24c..8d89ff839 100644 --- a/npc/pre-re/merchants/ammo_dealer.txt +++ b/npc/pre-re/merchants/ammo_dealer.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/pre-re/merchants/shops.txt b/npc/pre-re/merchants/shops.txt index f5dd954f8..cfcc82e8f 100644 --- a/npc/pre-re/merchants/shops.txt +++ b/npc/pre-re/merchants/shops.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2016 Hercules Dev Team -//= Copyright (C) Frost -//= Copyright (C) Streusel -//= Copyright (C) Daegaladh +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Frost +//= Copyright (C) Streusel +//= Copyright (C) Daegaladh //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by |