diff options
| author | Walther Neuper <wneuper@localhost.(none)> | 2010-05-17 13:49:36 (GMT) |
|---|---|---|
| committer | Walther Neuper <wneuper@localhost.(none)> | 2010-05-17 13:49:36 (GMT) |
| commit | 2be2e8c3a606e11ebf4ebddb41c78f027bacced4 (patch) | |
| tree | 90d35aecc63f748a4f4c39f1d1e5b04fff48d853 /.gitignore | |
| parent | 4d4362ee90b887c85ebfd98c7e8d4014c624151a (diff) | |
| parent | 9f7c29765b405cb91c6ea82ec4c7be3c811fbcef (diff) | |
Merge branch 'wintersw'
Conflicts:
ReckonPrimer.activity/data/Collection.data
ReckonPrimer.activity/display.py
ReckonPrimer.activity/exstore.py
ReckonPrimer.activity/settings.py
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions