Ignore:
Timestamp:
09/07/13 22:48:35 (8 years ago)
Author:
David Sharpe <decoydavid@…>
Branch:
default
Parents:
616:11a3ac7365cd (diff), 609:9ea26b835271 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Phase:
public
Message:

Merge

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • data/levels/cargo_bay

    r605 r617  
    111111  - [1800, 1265]
    112112  - crew
    113   - [108, 1623]
     113  - [2935, 1205]
    114114  - 0
    115115  classname: Door
  • data/levels/cargo_bay

    r616 r617  
    123123  classname: Note
    124124lines: []
    125 music: POL-cyber-factory-short.ogg
     125music: POL-tekdrome-short.ogg
    126126polygons:
    127127  1:
Note: See TracChangeset for help on using the changeset viewer.