Changeset 132ab5d1 in mainline for .gitignore

Timestamp:

2018-01-30T03:20:45Z (7 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

• .gitignore (modified) (4 diffs)

.gitignore

@@ -14 +14 @@
 deps.mk
 Makefile.ag.depend
-Makefile.common
-Makefile.config
+/Makefile.config
+/Makefile.common
 autotool/
 boot/distroot/
 boot/initrd.img
-common.h
-config.h
-cscope.out
-hdisk.img
-image.iso
+/common.h
+/config.h
+/cscope.out
+doxygen/doxygen.cfg
+doxygen/doxygen.cfg.gen
+doxygen/html/
+doxygen/latex/
+/hdisk.img
+/image.iso
 kernel/arch/amd64/_link.ld
 kernel/arch/amd64/include/arch/boot/memmap_struct.h
@@ -252 +256 @@
 uspace/dist/logo.tga
 uspace/dist/srv/cdfs
+uspace/dist/srv/chardev-test
 uspace/dist/srv/clipboard
 uspace/dist/srv/compositor
@@ -313 +318 @@
 uspace/drv/fb/amdm37x_dispc/amdm37x_dispc
 uspace/drv/fb/kfb/kfb
+uspace/drv/hid/adb-kbd/adb-kbd
+uspace/drv/hid/adb-mouse/adb-mouse
 uspace/drv/hid/atkbd/atkbd
 uspace/drv/hid/xtkbd/xtkbd
@@ -425 +432 @@
 uspace/srv/ns/ns
 uspace/srv/taskmon/taskmon
+uspace/srv/test/chardev-test/chardev-test
 uspace/srv/vfs/vfs
 uspace/srv/volsrv/volsrv
+tools/amd64-unknown-elf
+tools/arm-linux-gnueabi
+tools/i686-pc-linux-gnu
+tools/ia64-pc-linux-gnu
+tools/mips-linux-gnu
+tools/mips64el-linux-gnu
+tools/mipsel-linux-gnu
+tools/ppc-linux-gnu
+tools/ppc64-linux-gnu
+tools/riscv64-unknown-linux-gnu
+tools/sparc64-linux-gnu
+tools/binutils-*.tar.bz2
+tools/gcc-*.tar.bz2
+tools/gdb-*.tar.gz
+tools/sycek/