Changeset 03936831 in mainline for .bzrignore

Timestamp:

2017-10-20T09:16:55Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

1252e81

Parents:

fe1c48d (diff), 04efacc (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 mainline to fix build

File:

• .bzrignore (modified) (6 diffs)

.bzrignore

@@ -196 +196 @@
 uspace/dist/demo.xm
 uspace/dist/drv/ahci/
+uspace/dist/drv/apic/
 uspace/dist/drv/ar9271/
 uspace/dist/drv/ata_bd/
@@ -204 +205 @@
 uspace/dist/drv/hdaudio/
 uspace/dist/drv/i8042/
+uspace/dist/drv/i8259/
 uspace/dist/drv/icp/
 uspace/dist/drv/icp-ic/
@@ -236 +238 @@
 uspace/dist/inc/c/
 uspace/dist/logo.tga
-uspace/dist/srv/apic
 uspace/dist/srv/cdfs
 uspace/dist/srv/clipboard
@@ -250 +251 @@
 uspace/dist/srv/file_bd
 uspace/dist/srv/hound
-uspace/dist/srv/i8259
 uspace/dist/srv/inetsrv
 uspace/dist/srv/input
@@ -299 +299 @@
 uspace/drv/fb/amdm37x_dispc/amdm37x_dispc
 uspace/drv/fb/kfb/kfb
+uspace/drv/intctl/apic/apic
+uspace/drv/intctl/i8259/i8259
 uspace/drv/intctl/icp-ic/icp-ic
 uspace/drv/nic/ar9271/ar9271
@@ -385 +387 @@
 uspace/srv/hw/bus/cuda_adb/cuda_adb
 uspace/srv/hw/char/s3c24xx_uart/s3c24ser
-uspace/srv/hw/irc/apic/apic
-uspace/srv/hw/irc/i8259/i8259
 uspace/srv/hw/irc/obio/obio
 uspace/srv/klog/klog