Merge branch 'post-05' into post-06

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

View File

@@ -1,6 +1,6 @@
# Blog OS (CPU Exceptions)
[![Build Status](https://travis-ci.org/phil-opp/blog_os.svg?branch=post-06)](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-06.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 [CPU Exceptions][post] post of the [Writing an OS in Rust](https://os.phil-opp.com) series.