Changeset fb4d788 in mainline for .bzrignore

Timestamp:

2015-07-28T11:28:14Z (9 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

6accc5cf

Parents:

df2bce3 (diff), 47726b5e (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 from the mainline

File:

• .bzrignore (modified) (4 diffs)

.bzrignore

@@ -80 +80 @@
 uspace/app/wavplay/wavplay
 uspace/app/websrv/websrv
+uspace/app/wifi_supplicant/wifi_supplicant
 uspace/dist/app/barber
 uspace/dist/app/bdsh
@@ -133 +134 @@
 uspace/dist/app/wavplay
 uspace/dist/app/websrv
+uspace/dist/app/wifi_supplicant
 uspace/dist/drv/ahci/
+uspace/dist/drv/ar9271/
 uspace/dist/drv/ata_bd/
 uspace/dist/drv/cmos-rtc/
@@ -202 +205 @@
 uspace/drv/block/ahci/ahci
 uspace/drv/block/ata_bd/ata_bd
+uspace/drv/block/ddisk/ddisk
 uspace/drv/bus/isa/isa
 uspace/drv/bus/pci/pciintel/pciintel
@@ -224 +228 @@
 uspace/drv/platform/pc/pc
 uspace/drv/platform/rootpc/rootpc
+uspace/drv/nic/ar9271/ar9271
 uspace/drv/nic/e1k/e1k
 uspace/drv/nic/ne2k/ne2k