[root]/maps/branches/lalo-pupland/brest
Castle
(5 files, 23904 lines)
apartments
(1 files, 10605 lines)
asyvan
(12 files, 42239 lines)
black_shield
(4 files, 13184 lines)
brittany
(22 files, 131335 lines)
misc
(1 files, 5342 lines)
privateshops
(29 files, 275243 lines)
pshops
(7 files, 13201 lines)
pshop1
(4 files, 23092 lines)
pshop10
(4 files, 23092 lines)
pshop11
(4 files, 23092 lines)
pshop12
(4 files, 23092 lines)
pshop13
(4 files, 23092 lines)
pshop14
(4 files, 23092 lines)
pshop15
(4 files, 23092 lines)
pshop16
(4 files, 23092 lines)
pshop17
(4 files, 23092 lines)
pshop18
(4 files, 23092 lines)
pshop19
(4 files, 23092 lines)
pshop2
(4 files, 23092 lines)
pshop20
(4 files, 23092 lines)
pshop21
(4 files, 23092 lines)
pshop22
(4 files, 23092 lines)
pshop23
(4 files, 23092 lines)
pshop24
(4 files, 23092 lines)
pshop25
(4 files, 23092 lines)
pshop26
(4 files, 23092 lines)
pshop27
(4 files, 23092 lines)
pshop3
(4 files, 23092 lines)
pshop4
(4 files, 23092 lines)
pshop5
(4 files, 23092 lines)
pshop6
(4 files, 23092 lines)
pshop7
(4 files, 23092 lines)
pshop8
(4 files, 23092 lines)
pshop9
(4 files, 23092 lines)
shops
(8 files, 27743 lines)
sow
(2 files, 12321 lines)
taverns
(1 files, 3666 lines)
temples
(1 files, 3733 lines)
zorn
(6 files, 154578 lines)
Author | Changes | Lines of Code | Lines per Change |
---|---|---|---|
Totals | 196 (100.0%) | 228308 (100.0%) | 1164.8 |
lalo | 50 (25.5%) | 221072 (96.8%) | 4421.4 |
rjtanner | 71 (36.2%) | 7211 (3.2%) | 101.5 |
qal21 | 75 (38.3%) | 25 (0.0%) | 0.3 |
Merge in changes from Trunk.
2 lines of code changed in 1 file:
Merge from Trunk changes to brest/ with the exception of the guild map.
3256 lines of code changed in 26 files:
Synchronize map changes between trunk, branches/1.x and branches/lalo-pupland
826 lines of code changed in 1 file:
Synchronize map changes between trunk, branches/1.x and branches/lalo-pupland
232 lines of code changed in 11 files:
Synchronize map changes between trunk, branches/1.x and branches/lalo-pupland
190 lines of code changed in 10 files:
Changes due to map editor reformatting. Hopefully this will make future merging easier.
2705 lines of code changed in 22 files:
re-creating my branch
221072 lines of code changed in 25 files:
killing my branch
0 lines of code changed in 25 files:
Set svn:eol-style to LF for all map files in branches.
25 lines of code changed in 25 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 50 files: