Merge branch 'master' of rtime.felk.cvut.cz:/edu/osp-wiki

diff --git a/prednasky/osp-event-processing.odp b/prednasky/osp-event-processing.odp
index 7fb32b6bd8e1a93f41e6b93a71838613f7e17274..8c2d3e6c3c408e43804e2b811194a09053bcb6a7 100644 (file)
Binary files a/prednasky/osp-event-processing.odp and b/prednasky/osp-event-processing.odp differ

diff --git a/prednasky/osp-event-processing.pdf b/prednasky/osp-event-processing.pdf
index d9cb057a459174092a30ae2da542e6e07fe34a18..5bb078934658f4a4a2bb09302b72d4f5d8205529 100644 (file)
Binary files a/prednasky/osp-event-processing.pdf and b/prednasky/osp-event-processing.pdf differ

diff --git a/prednasky/osp-linux-distributions.odp b/prednasky/osp-linux-distributions.odp
index 2ea02ae918de775ffcd5166cd60f39cd53c5f042..1c52bad3056ceab27cad3a1ece4eb326d2a38720 100644 (file)
Binary files a/prednasky/osp-linux-distributions.odp and b/prednasky/osp-linux-distributions.odp differ

diff --git a/prednasky/osp-linux-distributions.pdf b/prednasky/osp-linux-distributions.pdf
index adb4df8e3ad092ca28b94a204a74c6fca7b545cf..5451f851ae7c3691a16c73319fffa5e59334dffa 100644 (file)
Binary files a/prednasky/osp-linux-distributions.pdf and b/prednasky/osp-linux-distributions.pdf differ

diff --git a/prednasky/osp-linux-fs-vmm.odp b/prednasky/osp-linux-fs-vmm.odp
index c974ebbd9ab8521d10b219ea5d00beba44049ca4..eeaeb03ea47dc748e9a075908fb3b84b1e38135c 100644 (file)
Binary files a/prednasky/osp-linux-fs-vmm.odp and b/prednasky/osp-linux-fs-vmm.odp differ

diff --git a/prednasky/osp-linux-fs-vmm.pdf b/prednasky/osp-linux-fs-vmm.pdf
index 70e8c135010a5ddf57e447d56eb979561c1ac313..c0ef1246e0f831e4a104fba2ceb16130dee3fa0c 100644 (file)
Binary files a/prednasky/osp-linux-fs-vmm.pdf and b/prednasky/osp-linux-fs-vmm.pdf differ