Changeset 77a194c in mainline for .bzrignore

Timestamp:

2015-11-04T18:55:46Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

44183b98

Parents:

5265eea4 (diff), bfcde8d (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 new disk partitioning architecture.

File:

• .bzrignore (modified) (8 diffs)

.bzrignore

@@ -34 +34 @@
 uspace/app/dnsres/dnsres
 uspace/app/edit/edit
+uspace/app/fdisk/fdisk
 uspace/app/fontviewer/fontviewer
 uspace/app/getterm/getterm
@@ -91 +92 @@
 uspace/dist/app/dnsres
 uspace/dist/app/edit
+uspace/dist/app/fdisk
 uspace/dist/app/fontviewer
 uspace/dist/app/getterm
@@ -181 +183 @@
 uspace/dist/srv/fat
 uspace/dist/srv/file_bd
-uspace/dist/srv/g_part
 uspace/dist/srv/hound
 uspace/dist/srv/i8259
@@ -189 +190 @@
 uspace/dist/srv/locfs
 uspace/dist/srv/loopip
-uspace/dist/srv/mbr_part
 uspace/dist/srv/mfs
 uspace/dist/srv/output
@@ -200 +200 @@
 uspace/dist/srv/udf
 uspace/dist/srv/udp
+uspace/dist/srv/vbd
+uspace/dist/srv/volsrv
 uspace/dist/test/*
 uspace/drv/audio/hdaudio/hdaudio
@@ -252 +254 @@
 uspace/srv/audio/hound/hound
 uspace/srv/bd/file_bd/file_bd
-uspace/srv/bd/part/guid_part/g_part
-uspace/srv/bd/part/mbr_part/mbr_part
 uspace/srv/bd/rd/rd
 uspace/srv/bd/sata_bd/sata_bd
+uspace/srv/bd/vbd/vbd
 uspace/srv/clipboard/clipboard
 uspace/srv/devman/devman
@@ -290 +291 @@
 uspace/srv/ns/ns
 uspace/srv/taskmon/taskmon
+uspace/srv/volsrv/volsrv
 uspace/srv/vfs/vfs
 kernel/arch/ia32/_link.ld
@@ -313 +315 @@
 uspace/app/viewer/viewer
 uspace/dist/app/viewer
-uspace/app/hdisk/hdisk
-uspace/dist/app/hdisk
 uspace/app/untar/untar
 uspace/dist/app/untar