diff options
| author |  rcoh <rcoh@mit.edu> | 2011-02-16 18:29:41 -0500 |
|---|---|---|
| committer | rcoh <rcoh@mit.edu> | 2011-02-16 18:29:41 -0500 |
| commit | fffc14c4672294d9bbf8c60edfe8c309f0d54698 (patch) | |
| tree | 19057b2e98735cc30fa1e0b3932d416946f8d705 /.gitignore | |
| parent | 24aa31808de6a4dc06a651076e5b292aebd9240d (diff) | |
| parent | 2df9e408a0ff74539862c4a4e562a878cc11a329 (diff) | |
Merge branch 'conner5' of https://github.com/dxiao/SmootLight into dxiao-conner5
Conflicts:
config/C5Sign.xml
layouts/SpecifiedLayout.py
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions