diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-08-15 09:11:29 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-08-15 09:11:29 +0200 |
| commit | 1e5c123ae659991f2c8534001d889129d69bedc4 (patch) | |
| tree | 6509d44cfe545cbfa4d124c06a9b2215def7352a /.gitignore | |
| parent | e037fc5228747c7e0d5a3609471943d371c9def5 (diff) | |
| parent | accbb4cb78b50f3d26fbbca5beb664ac5d41bceb (diff) | |
Merge branch 'allinone-nb' into allinone-multilang
Conflicts (preserved original):
Makefile
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions