diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-10-17 22:07:24 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-10-17 22:07:24 +0300 |
| commit | d14bb7a27ee23cc83b3af1db2f1976eaaa55d78a (patch) | |
| tree | 5f128768c66436eefd70632f02889607596609d4 /.gitignore | |
| parent | f1e92aca00a4859047e83fab76220767b9a2f814 (diff) | |
| parent | e93e6beb456d105987da3190c2a80847b6900081 (diff) | |
| download | plus-d14bb7a27ee23cc83b3af1db2f1976eaaa55d78a.tar.gz plus-d14bb7a27ee23cc83b3af1db2f1976eaaa55d78a.tar.bz2 plus-d14bb7a27ee23cc83b3af1db2f1976eaaa55d78a.tar.xz plus-d14bb7a27ee23cc83b3af1db2f1976eaaa55d78a.zip | |
Merge branch 'master' into strippedstripped1.1.10.16
Conflicts:
data/fonts/mplus-1p-bold.ttf
data/fonts/mplus-1p-regular.ttf
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/.gitignore b/.gitignore index e775b63f9..bef2937de 100644 --- a/.gitignore +++ b/.gitignore @@ -79,25 +79,26 @@ mana.creator.user* run/* my/* win/* -make.log -make1.log -make2.log -make_nsiqcppstyle.txt -bcmake1 -bmake1 -gprof.png -gprof.txt -gmon.out -makecheck.txt -makecheck_err.txt -makeflawfinder.log -makegprof1 -pmake1 -packwin1 -toolchain.cmake1 -makerats.log -make_hc.txt -make_hc2.txt +build/make.log +build/make1.log +build/make2.log +build/make_nsiqcppstyle.txt +build/bcmake1 +build/bmake1 +build/gprof.png +build/gprof.txt +build/gprof.dot +build/gmon.out +build/makecheck.txt +build/makecheck_err.txt +build/makeflawfinder.log +build/makegprof1 +build/pmake1 +build/packwin1 +build/toolchain.cmake1 +build/makerats.log +build/make_hc.txt +build/make_hc2.txt # debian debian/* |