Changeset 15d0046 in mainline for .bzrignore

Timestamp:

2014-09-12T13:22:33Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

9b20126

Parents:

8db09e4 (diff), 105d8d6 (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 changes

File:

• .bzrignore (modified) (8 diffs)

.bzrignore

@@ -28 +28 @@
 uspace/app/dnsres/dnsres
 uspace/app/edit/edit
+uspace/app/fontviewer/fontviewer
 uspace/app/getterm/getterm
 uspace/app/inet/inet
@@ -45 +46 @@
 uspace/app/nettest2/nettest2
 uspace/app/nettest3/nettest3
+uspace/app/nic/nic
 uspace/app/nterm/nterm
 uspace/app/ping/ping
@@ -78 +80 @@
 uspace/dist/app/dnsres
 uspace/dist/app/edit
+uspace/dist/app/fontviewer
 uspace/dist/app/getterm
 uspace/dist/app/inet
@@ -94 +97 @@
 uspace/dist/app/nettest2
 uspace/dist/app/nettest3
+uspace/dist/app/nic
 uspace/dist/app/nterm
 uspace/dist/app/ping
@@ -121 +125 @@
 uspace/dist/drv/e1k/
 uspace/dist/drv/ehci/
+uspace/dist/drv/hdaudio/
 uspace/dist/drv/i8042/
 uspace/dist/drv/isa/
@@ -131 +136 @@
 uspace/dist/drv/root/
 uspace/dist/drv/rootpc/
-uspace/dist/drv/rootvirt/
+uspace/dist/drv/virt/
 uspace/dist/drv/rtl8139/
+uspace/dist/drv/rtl8169/
 uspace/dist/drv/sb16/
 uspace/dist/drv/test1/
@@ -177 +183 @@
 uspace/dist/srv/udf
 uspace/dist/srv/udp
+uspace/drv/audio/hdaudio/hdaudio
 uspace/drv/audio/sb16/sb16
 uspace/drv/block/ahci/ahci
@@ -197 +204 @@
 uspace/drv/char/xtkbd/xtkbd
 uspace/drv/fb/kfb/kfb
-uspace/drv/infrastructure/root/root
-uspace/drv/infrastructure/rootpc/rootpc
-uspace/drv/infrastructure/rootvirt/rootvirt
+uspace/drv/root/root/root
+uspace/drv/root/virt/virt
+uspace/drv/platform/rootpc/rootpc
 uspace/drv/nic/e1k/e1k
 uspace/drv/nic/ne2k/ne2k
 uspace/drv/nic/rtl8139/rtl8139
+uspace/drv/nic/rtl8169/rtl8169
 uspace/drv/test/test1/test1
 uspace/drv/test/test2/test2