Skip to content

Commit

Permalink
Merge pull request #75 from lorderikir/master
Browse files Browse the repository at this point in the history
[U][UI][P][D] v0.5.2 Update
  • Loading branch information
ericjiang97 authored Jul 4, 2016
2 parents 478797f + b08120d commit 4cfeaeb
Show file tree
Hide file tree
Showing 6 changed files with 242 additions and 75 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[![Build Status](https://travis-ci.org/MARIE-js/MARIE.js.svg?branch=master)](https://travis-ci.org/MARIE-js/MARIE.js) [![devDependency Status](https://david-dm.org/marie-js/MARIE.js/dev-status.svg)](https://david-dm.org/marie-js/MARIE.js#info=devDependencies)
==============
Current version: `0.5`
Current version: `0.5.2`

MARIE.js is an implementation of a simulator for a 'Machine Architecture that is Really Intuitive and Easy'
from [The Essentials of Computer Organization and Architecture](https://books.google.com.au/books/about/The_Essentials_of_Computer_Organization.html?id=3kQoAwAAQBAJ&redir_esc=y) (Linda Null, Julia Lobur) in JavaScript.
Expand All @@ -11,7 +11,7 @@ from [The Essentials of Computer Organization and Architecture](https://books.go
# Install npm and grunt by:
sudo apt-get install npm
sudo apt-get install grunt-cli

# Run these commands:
cd /path/to/repo/MARIE.js
npm install
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "MARIE.js",
"version": "0.5.0",
"version": "0.5.2",
"description": "MARIE.js is an implementation of a simulator for a 'Machine Architecture that is Really Intuitive and Easy' from The Essentials of Computer Organization and Architecture (Linda Null, Julia Lobur) in JavaScript.",
"main": "index.js",
"scripts": {
Expand Down
Loading

0 comments on commit 4cfeaeb

Please sign in to comment.