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: charmedlabs/pixy
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: Learath/pixy
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 4 commits
  • 3 files changed
  • 2 contributors

Commits on Apr 1, 2014

  1. Fix Linux USB bug and compile issues on Centos.

    nick committed Apr 1, 2014
    Configuration menu
    Copy the full SHA
    56498c0 View commit details
    Browse the repository at this point in the history

  2. Actually catch all the files this time.

    nick committed Apr 1, 2014
    Configuration menu
    Copy the full SHA
    c8c6cf9 View commit details
    Browse the repository at this point in the history

  3. Missed a missing header. (stdlib.h)

    nick committed Apr 1, 2014
    Configuration menu
    Copy the full SHA
    9cf4414 View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2014

  1. Merge remote branch 'upstream/master' 

    Conflicts:
	host/pixymon/libusb-1.0.dll
	host/pixymon/libusb-1.0.dll.a
	host/pixymon/libusb.h
	host/pixymon/libusb/libusb-1.0.dll
	host/pixymon/libusb/libusb-1.0.dll.a
	host/pixymon/libusb/libusb.a
	host/pixymon/libusb/libusb.h
	src/host/pixymon/dfu.cpp
	src/host/pixymon/pixymon.pro
	src/host/pixymon/usblink.cpp
	src/host/windows/libusb-1.0.dll
	src/host/windows/libusb-1.0.dll.a
	src/host/windows/libusb.h
    @Learath
    Learath committed Oct 31, 2014
    Configuration menu
    Copy the full SHA
    92de72e View commit details
    Browse the repository at this point in the history
Loading