diff options
author | Thomas Schwinge <thomas@schwinge.name> | 2010-12-13 17:11:51 +0100 |
---|---|---|
committer | Thomas Schwinge <thomas@schwinge.name> | 2010-12-13 17:11:51 +0100 |
commit | 2d75167da62e3486836e5f1773e5f1ab06e43fe8 (patch) | |
tree | e44fc83e0b1419836d1b21652ad1d38b8d0af2c4 /unsorted/BochsFAQ.mdwn | |
parent | 217998d56f5b6424a685f8c87f2c0e924d1c89da (diff) | |
parent | 5c5c16e265d8ef56b71f319885f32bf144bdea23 (diff) |
Merge branch 'master' into external_pager_mechanism
Conflicts:
microkernel/mach/external_pager_mechanism.mdwn
Diffstat (limited to 'unsorted/BochsFAQ.mdwn')
-rw-r--r-- | unsorted/BochsFAQ.mdwn | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/unsorted/BochsFAQ.mdwn b/unsorted/BochsFAQ.mdwn index d446f695..474bbed5 100644 --- a/unsorted/BochsFAQ.mdwn +++ b/unsorted/BochsFAQ.mdwn @@ -1,7 +1,5 @@ # <a name="GNU_pre0_3_J2_for_Bochs_mini_FAQ"> </a> GNU pre0.3-J2 for Bochs mini-FAQ -%TOC% - ---- ## <a name="What_do_you_mean_GNU_the_GNU_Hur"> </a> What do you mean "GNU", the GNU Hurd? |