Too careless while resolving conflicts in boot.lua.

Browse Source

...

This commit is contained in:

rude

2010-09-19 13:51:29 +02:00

parent 25aa6aa766

commit 8515ee675d

2 changed files with 2239 additions and 637 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

src/scripts/boot.lua.h

+1886 -549

File diff suppressed because it is too large Load Diff