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: sinara-hw/sinara
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 752331fe437e
Choose a base ref
...
head repository: sinara-hw/sinara
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f092be646838
Choose a head ref
  • 2 commits
  • 70 files changed
  • 1 contributor

Commits on Jan 22, 2018

  1. update panel designs

    @gkasprow
    gkasprow committed Jan 22, 2018
    Copy the full SHA
    b7433a6 View commit details

  2. Merge branch 'master' of https://github.com/m-labs/sinara 

    # Conflicts:
#	ARTIQ_ALTIUM/Kasli/PCB_Kasli/PCB_3U_Kasli.PrjPCB
#	ARTIQ_ALTIUM/Kasli/PCB_Kasli/PCB_KASLI.OutJob
#	ARTIQ_ALTIUM/Kasli/PCB_Kasli/Project Outputs for Kasli/KASLI.PDF
    @gkasprow
    gkasprow committed Jan 22, 2018
    Copy the full SHA
    f092be6 View commit details
Loading