Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mhalicot's Item Bind Pull Request #220

Merged
merged 9 commits into from
Nov 7, 2013
Merged

mhalicot's Item Bind Pull Request #220

merged 9 commits into from
Nov 7, 2013

Conversation

shennetsind
Copy link
Member

Adjustments/Updates to the #214 pull request made by @mhalicot

mhalicot and others added 9 commits October 31, 2013 12:42
… crash.

Im pretty sure its on the clif.c

Signed-off-by: sevenzz23 <sevenzz23@yahoo.com>
Fixed, some issue thanks to Master Ind ;)

Signed-off-by: sevenzz23 <sevenzz23@yahoo.com>
Signed-off-by: sevenzz23 <sevenzz23@yahoo.com>
Signed-off-by: sevenzz23 <sevenzz23@yahoo.com>
Signed-off-by: shennetsind <ind@henn.et>

Conflicts:
	conf/messages.conf
	src/common/mmo.h
	src/map/pc_groups.c
	src/map/pc_groups.h
Re-added the changes that were gone in the update conflict.

Signed-off-by: shennetsind <ind@henn.et>
Special Thanks to Haruna

Signed-off-by: shennetsind <ind@henn.et>
Thanks to Haruna!

Signed-off-by: shennetsind <ind@henn.et>
@shennetsind
Copy link
Member Author

Closes #214

shennetsind added a commit that referenced this pull request Nov 7, 2013
mhalicot's Item Bind Pull Request
@shennetsind shennetsind merged commit 01e4647 into HerculesWS:master Nov 7, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants