diff options
author | Yorhel <git@yorhel.nl> | 2010-02-05 12:25:11 +0100 |
---|---|---|
committer | Yorhel <git@yorhel.nl> | 2010-02-05 12:25:11 +0100 |
commit | 7cbc9315a6e4315a62da080381f300e3b5d80f56 (patch) | |
tree | dfbcfa6714ac23bd8cb6271948a3017b7059c645 /.gitignore | |
parent | b541d72849cd859580e7e6d7232165c92aa3a40b (diff) | |
parent | 3f69720f88396543c34a682093f147afbef75c65 (diff) |
Merge branch 'master' into beta
Conflicts:
data/lang.txt
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions