diff options
| author | vetch <vetch97@gmail.com> | 2020-01-02 17:54:31 +0100 |
|---|---|---|
| committer | vetch <vetch97@gmail.com> | 2020-01-02 17:54:31 +0100 |
| commit | ab7b754bb32022336527c1a2d5d710b95a589d0e (patch) | |
| tree | 19f508f06c72efcbdd2cfad46949ed6f1ae45a3c /.gitignore | |
| parent | 5e1e6796109c892c4300c3da17c35e7874a40107 (diff) | |
| parent | 6bf5a3b8c6e8a5d1cb3fb4880a5d9688ab094c62 (diff) | |
| download | rpi-MMU-example-ab7b754bb32022336527c1a2d5d710b95a589d0e.tar.gz rpi-MMU-example-ab7b754bb32022336527c1a2d5d710b95a589d0e.zip | |
Merge branch 'bob' of https://repo.or.cz/RPi-MMU-example into alice
# Conflicts:
# .gitignore
# PL0_test.ld
# demo_functionality.c
# interrupt_vector.S
# interrupts.c
# kernel.c
# memory.h
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -1,2 +1,7 @@ .gitignore .idea +*.o +*.elf +*.img +pipe_image +makefs |