aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMu Qiao <qiaomuf@gentoo.org>2011-06-26 20:27:46 +0800
committerMu Qiao <qiaomuf@gentoo.org>2011-06-26 20:27:46 +0800
commitb7ff827783049072f8afefad626522e39c092511 (patch)
treea780e7b362036388040f990f372a64496a8e67a2 /.gitignore
parentMerge remote-tracking branch 'mu/fix_arithmetic' (diff)
parentParser: use lexer rule to parse singled quoted string (diff)
downloadlibbash-b7ff827783049072f8afefad626522e39c092511.tar.gz
libbash-b7ff827783049072f8afefad626522e39c092511.tar.bz2
libbash-b7ff827783049072f8afefad626522e39c092511.zip
Merge branch 'mu/native_code'
Conflicts: Makefile.am bashast/features_script/features.sh.ast bashast/gunit/simp_command.gunit scripts/command_execution.bash test/verify_error_output_test.sh
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore8
1 files changed, 5 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index 4c665a8..7a07a66 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+*.bak
*.swp
*.swo
*.o
@@ -6,6 +7,8 @@
*.lo
*.log
*.class
+*.java
+*.tokens
.deps
.libs
.dirstamp
@@ -26,9 +29,9 @@ instruo
long.sh
massif.out
libbash.g
-libbash.tokens
+java_libbash.g
libbash.tokens.md5
-bashast.tokens
+libbashWalker.h.md5
bashast/.DS_Store
bashast/*.ebuild
bashast/c_runtime
@@ -42,7 +45,6 @@ libbashLexer.*
libbashParser.*
libbashWalker.h
libbashWalker.cpp
-libbashWalker.tokens
*.pdf
*.aux
config.*