diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-15 22:30:13 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-15 22:30:13 +0100 |
commit | c57d0300bd42fabd8eeda2a95b6c3960d6e7ce07 (patch) | |
tree | b53bc538246b5a900300b5c6b5ea740f978196f4 /.gitignore | |
parent | cf4b3959527339206254b8c8fc44deb391beeb10 (diff) | |
parent | 023560ac69a2ecf5659c668c26c0af6b5612a46b (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
package/nspr/Makefile
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore index aec87fdd9..3c58ed468 100644 --- a/.gitignore +++ b/.gitignore @@ -12,16 +12,17 @@ config/zconf.tab.c config/zconf.tab.h prereq.mk toolchain_build_*/ +.ADK_HAVE_DOT_CONFIG .tmpconfig.h .prereq_done .config* +.busyboxcfg .defconfig all.config -.cfg/ -.cfg.*/ +.cfg_*/ cross_*/ root_*/ -bin_*/ +bin/ build_*/ config/*.o config/lxdialog/*.o @@ -30,7 +31,7 @@ dl/ package/*/info.mk package/*/Config.in package/*/Config.in.lib +package/*/Config.in.kmod tools_build/ extra/ -bulkdir/ .menu |