diff options
| author | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-03-09 19:00:35 +0000 |
|---|---|---|
| committer | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-03-09 19:00:35 +0000 |
| commit | 168677929dc43930a81a49a54d748a3b2298a811 (patch) | |
| tree | 8eb547e2537ea19df6ad193d66411db939d36827 /db | |
| parent | 5cca96bf950bcd9586ab04f0e0f2b5d9a556c5e0 (diff) | |
| download | hercules-168677929dc43930a81a49a54d748a3b2298a811.tar.gz hercules-168677929dc43930a81a49a54d748a3b2298a811.tar.bz2 hercules-168677929dc43930a81a49a54d748a3b2298a811.tar.xz hercules-168677929dc43930a81a49a54d748a3b2298a811.zip | |
* Fixed some missing/wrong bits in merge from trunk (follow up to r14740).
- Fixed added files not being svn-copied (thus lacking svn history).
- Applied missing property changes.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14741 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'db')
| -rw-r--r-- | db/mob_db.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/db/mob_db.txt b/db/mob_db.txt index c5a018828..63c94fff6 100644 --- a/db/mob_db.txt +++ b/db/mob_db.txt @@ -1179,4 +1179,3 @@ //2123,EL_TERA_S,Tera,Tera,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //2124,EL_TERA_M,Tera,Tera,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //2125,EL_TERA_L,Tera,Tera,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 - |