]> rtime.felk.cvut.cz Git - edu/osp-wiki.git/commitdiff
projects / edu / osp-wiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: 3f387e7)
Merge branch 'master' of rtime:edu/osp-wiki
authorMichal Sojka <sojkam1@fel.cvut.cz>
Mon, 28 Jan 2013 10:08:42 +0000 (11:08 +0100)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Mon, 28 Jan 2013 10:08:42 +0000 (11:08 +0100)
prednasky/osp-hw-and-porting.odp patch | blob | history
prednasky/osp-linux-overview.odp patch | blob | history

diff --git a/prednasky/osp-hw-and-porting.odp b/prednasky/osp-hw-and-porting.odp
index 128d24f39a9bb11e368974318acc8895ed17e452..79bcf13707c4f019f8e4938149d785eaf1dda292 100644 (file)
Binary files a/prednasky/osp-hw-and-porting.odp and b/prednasky/osp-hw-and-porting.odp differ
diff --git a/prednasky/osp-linux-overview.odp b/prednasky/osp-linux-overview.odp
index 38f7242c40000f16ea0edb1827daff8fa9b272cd..9e3ef51de1beeb1e462487d02e50a0e7533b8d0f 100644 (file)
Binary files a/prednasky/osp-linux-overview.odp and b/prednasky/osp-linux-overview.odp differ
IkiWiki for Open Source Programming course