Merge branch 'proposed/database-derby'

Browse Source

Conflicts:
	pom.xml

...

This commit is contained in:

Rogiel Sulzbach

2011-10-06 01:03:26 -03:00

parent c7beec1fd7 acc99985bf

commit 19d025e3fd

35 changed files with 1114 additions and 365 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

41644

l2jserver2-gameserver/distribution/sql/sql/npc.sql Normal file

File diff suppressed because it is too large Load Diff