Merge branch 'post-09' into post-10

# Conflicts:
#	README.md
This commit is contained in:
Philipp Oppermann
2019-04-03 10:47:15 +02:00

View File

@@ -1,6 +1,6 @@
# Blog OS (Paging Implementation) # Blog OS (Paging Implementation)
[![Build Status](https://travis-ci.org/phil-opp/blog_os.svg?branch=post-10)](https://travis-ci.org/phil-opp/blog_os/branches) [![Azure Pipelines CI build](https://img.shields.io/azure-devops/build/phil-opp/blog_os/1/post-10.svg?label=Build&style=flat-square)](https://dev.azure.com/phil-opp/blog_os/_build?definitionId=1)
This repository contains the source code for the [Paging Implementation][post] post of the [Writing an OS in Rust](https://os.phil-opp.com) series. This repository contains the source code for the [Paging Implementation][post] post of the [Writing an OS in Rust](https://os.phil-opp.com) series.