Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support basic library and resource loading #1

Merged
merged 9 commits into from
Feb 12, 2014
Merged

Commits on Feb 12, 2014

  1. Configuration menu
    Copy the full SHA
    d9dc96f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5cc2dd0 View commit details
    Browse the repository at this point in the history
  3. more cleanup

    itziakos committed Feb 12, 2014
    Configuration menu
    Copy the full SHA
    8bd2d02 View commit details
    Browse the repository at this point in the history
  4. minor layout change

    itziakos committed Feb 12, 2014
    Configuration menu
    Copy the full SHA
    336f3ce View commit details
    Browse the repository at this point in the history
  5. cleanup the cleanup

    itziakos committed Feb 12, 2014
    Configuration menu
    Copy the full SHA
    24d3105 View commit details
    Browse the repository at this point in the history
  6. it never stops

    itziakos committed Feb 12, 2014
    Configuration menu
    Copy the full SHA
    2e2a9df View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    202cce5 View commit details
    Browse the repository at this point in the history
  8. more tests

    itziakos committed Feb 12, 2014
    Configuration menu
    Copy the full SHA
    449b2b3 View commit details
    Browse the repository at this point in the history
  9. Merge branch 'master' into enh-load-resource

    # By David Cournapeau
    # Via David Cournapeau
    * master:
      MAINT: install pywin32.
      MAINT: finally enabling actual tests on travis-ci.
      MAINT: unattended setup of wine ppa.
      MAINT: hoping that a newer version of wine fixes the setuptools crash.
      MAINT: attempt at working around wine bug with ez_setup.py.
      MAINT: install test dependencies.
      MAINT: ensure python msi is installed unattended.
      MAINT: tweak travis-ci script to make wine work with Xvfb.
      MAINT: try running wine through XVFB.
      MAINT: run tests + coverage under wine on travis-ci.
    
    Conflicts:
    	.travis.yml
    itziakos committed Feb 12, 2014
    Configuration menu
    Copy the full SHA
    1fdd449 View commit details
    Browse the repository at this point in the history