[root]/maps/branches/lalo-pupland/navar_city/slums

| Author | Changes | Lines of Code | Lines per Change | 
|---|---|---|---|
| Totals | 30 (100.0%) | 21380 (100.0%) | 712.6 | 
| lalo | 8 (26.7%) | 21326 (99.7%) | 2665.7 | 
| rjtanner | 10 (33.3%) | 50 (0.2%) | 5.0 | 
| qal21 | 12 (40.0%) | 4 (0.0%) | 0.3 | 
Merge from Trunk changes to navar_city/ with the exception of the guild maps.
21 lines of code changed in 4 files:
Synchronize Navar map changes between trunk, branches/1.x and branches/lalo-pupland
7 lines of code changed in 4 files:
Changes due to map editor reformatting. Hopefully this will make future merging easier.
22 lines of code changed in 2 files:
re-creating my branch
21326 lines of code changed in 4 files:
killing my branch
0 lines of code changed in 4 files:
Set svn:eol-style to LF for all map files in branches.
4 lines of code changed in 4 files:
propdel svn:eol-style on all map tree files except actual text. Fixes broken win32 checkouts of maps. Now for branches.
0 lines of code changed in 8 files: