diff options
author | Mu Qiao <qiaomuf@gentoo.org> | 2011-06-26 20:27:46 +0800 |
---|---|---|
committer | Mu Qiao <qiaomuf@gentoo.org> | 2011-06-26 20:27:46 +0800 |
commit | b7ff827783049072f8afefad626522e39c092511 (patch) | |
tree | a780e7b362036388040f990f372a64496a8e67a2 /.gitignore | |
parent | Merge remote-tracking branch 'mu/fix_arithmetic' (diff) | |
parent | Parser: use lexer rule to parse singled quoted string (diff) | |
download | libbash-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-- | .gitignore | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -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.* |