Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/misoc
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: da171d8d0a1c
Choose a base ref
...
head repository: m-labs/misoc
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2de8e1de3879
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Nov 4, 2015

  1. conda: use correct branch

    @sbourdeauducq
    sbourdeauducq committed Nov 4, 2015
    Copy the full SHA
    1ea775e View commit details

  2. setup.py: consistent version number

    @sbourdeauducq
    sbourdeauducq committed Nov 4, 2015
    Copy the full SHA
    2de8e1d View commit details
Showing with 2 additions and 2 deletions.
  1. +1 −1 conda/misoc/meta.yaml
  2. +1 −1 setup.py
2 changes: 1 addition & 1 deletion conda/misoc/meta.yaml
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ package:

source:
git_url: https://github.com/m-labs/misoc
git_tag: new
git_tag: master

build:
noarch_python: true
2 changes: 1 addition & 1 deletion setup.py
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@

setup(
name="misoc",
version="1.0",
version="0.2",
description="a high performance and small footprint SoC based on Migen",
long_description=open("README").read(),
author="Sebastien Bourdeauducq",