diff options
| author | Samuel Bronson <naesten@gmail.com> | 2011-10-24 18:55:59 -0400 |
|---|---|---|
| committer | Samuel Bronson <naesten@gmail.com> | 2011-10-24 18:55:59 -0400 |
| commit | 4fdb08d8044fea1e137cd5565dcc18d0f9418c89 (patch) | |
| tree | a9b723250101098ea72f84c6c8179633fedcc89c /crawl-ref/.gitignore | |
| parent | 3ee79433628a0c6cb86b91536b2dce0db000d6d7 (diff) | |
| parent | 59d57f2e4de7619c77fbee0608e75fdd2a15075d (diff) | |
| download | crawl-ref-4fdb08d8044fea1e137cd5565dcc18d0f9418c89.tar.gz crawl-ref-4fdb08d8044fea1e137cd5565dcc18d0f9418c89.zip | |
Merge branch 'luadoc'
Conflicts:
crawl-ref/source/Makefile
Diffstat (limited to 'crawl-ref/.gitignore')
| -rw-r--r-- | crawl-ref/.gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/crawl-ref/.gitignore b/crawl-ref/.gitignore index 8dba804845..109411b75f 100644 --- a/crawl-ref/.gitignore +++ b/crawl-ref/.gitignore @@ -49,6 +49,9 @@ DEADJOE # Doxygen documentation /source/html/ +# Luadoc stuff +/source/luadoc/ + # Crawl generated junk arena.result saves |