Skip to content

Instantly share code, notes, and snippets.

@SRomansky
Created September 11, 2014 14:58
Show Gist options
  • Save SRomansky/91d4c274d904e9c9ed0e to your computer and use it in GitHub Desktop.
Save SRomansky/91d4c274d904e9c9ed0e to your computer and use it in GitHub Desktop.
Rebase mess, after creating new temp cherry-picked branch and reseting to it.
pick 9e2914a GH-123 Added paragraph to testing documentation roughly explaining new testing method with the python setup.py test script and parameter.
pick c5a7bab GH-467 Addressed feedback from dideler: condensed original 3 examples into one unittest discover example and reworded new example using PyTest.
pick 3f74114 gh-#467 removed references to unittest. Fixed spelling of pytest in example.
pick 4f92a70 gh-#467 added the first section of the QA part, back to the testing page.
pick aafa04a Updated markdown used in refering to directories.
pick b784dec Update link to project proposal
pick 38e4263 Added naming to popup dialogs in ConfigTool
pick dfae468 Close #435 Create HTTP API for controlling Freeseer recording
# Rebase 04b5896..dfae468 onto 04b5896
#
# Commands:
# p, pick = use commit
# r, reword = use commit, but edit the commit message
# e, edit = use commit, but stop for amending
# s, squash = use commit, but meld into previous commit
# f, fixup = like "squash", but discard this commit's log message
# x, exec = run command (the rest of the line) using shell
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment