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: emscripten-core/emscripten
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.35.20
Choose a base ref
...
head repository: emscripten-core/emscripten
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1.35.21
Choose a head ref
  • 15 commits
  • 13 files changed
  • 3 contributors

Commits on Jan 7, 2016

  1. Better support for GLFW2 keycodes

    Adam Clifton authored and Adam Clifton committed Jan 7, 2016
    Configuration menu
    Copy the full SHA
    28cccf2 View commit details
    Browse the repository at this point in the history

  2. Removed some whitespace

    Adam Clifton authored and Adam Clifton committed Jan 7, 2016
    Configuration menu
    Copy the full SHA
    6373933 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2016

  1. + Merge GLFW2 and GLFW3 input event testing together

    Adam Clifton authored and Adam Clifton committed Jan 11, 2016
    Configuration menu
    Copy the full SHA
    91e0f2b View commit details
    Browse the repository at this point in the history

  2. Make emranlib, system/bin/sdl-config and system/bin/sdl2-config execu… 

    …table in both python 2 and python 3.
    @juj
    juj committed Jan 11, 2016
    Configuration menu
    Copy the full SHA
    0376ac8 View commit details
    Browse the repository at this point in the history

  3. note in settings.js

    @kripken
    kripken committed Jan 11, 2016
    Configuration menu
    Copy the full SHA
    ef9e821 View commit details
    Browse the repository at this point in the history

  4. update sdl2 to version 10

    @kripken
    kripken committed Jan 11, 2016
    Configuration menu
    Copy the full SHA
    baac644 View commit details
    Browse the repository at this point in the history

  5. updating test_browser to point to renamed glfw_events

    Adam Clifton authored and Adam Clifton committed Jan 11, 2016
    Configuration menu
    Copy the full SHA
    2a9ce3e View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' of https://github.com/CliffyA/emscripten into i… 

    …ncoming

Conflicts:
	tests/glfw3_events.c
	tests/test_browser.py
    @kripken
    kripken committed Jan 11, 2016
    Configuration menu
    Copy the full SHA
    e15deee View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2016

  1. Fix execution of the page in non-pthreads-supporting browsers when -s… 

    … AGGRESSIVE_VARIABLE_ELIMINATION=1 is used with -s USE_PTHREADS=2.
    @juj
    juj committed Jan 12, 2016
    Configuration menu
    Copy the full SHA
    9360b3d View commit details
    Browse the repository at this point in the history

  2. Merge pull request #4035 from juj/use_pthreads_2_fallback 

    use_pthreads_2_fallback
    @juj
    juj committed Jan 12, 2016
    Configuration menu
    Copy the full SHA
    01de07e View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2016

  1. Make tools/line_endings.py print out content in the location where ba… 

    …d line endings exist for easy examination.
    @juj
    juj committed Jan 13, 2016
    Configuration menu
    Copy the full SHA
    d7d2764 View commit details
    Browse the repository at this point in the history

  2. Remove \r from line endings when converting library functions to stri… 

    …ngs, since these would get duplicated to \r\r\n later on when printing the strings out to file.
    @juj
    juj committed Jan 13, 2016
    Configuration menu
    Copy the full SHA
    5f47a12 View commit details
    Browse the repository at this point in the history

  3. update asm2wasm parameters for binaryen changes

    @kripken
    kripken committed Jan 13, 2016
    Configuration menu
    Copy the full SHA
    eef66eb View commit details
    Browse the repository at this point in the history

  4. Merge branch 'windows_r_r_n_fix' of https://github.com/juj/emscripten … 

    …into incoming
    @kripken
    kripken committed Jan 13, 2016
    Configuration menu
    Copy the full SHA
    fe75c7a View commit details
    Browse the repository at this point in the history

  5. 1.35.21

    @kripken
    kripken committed Jan 13, 2016
    Configuration menu
    Copy the full SHA
    46403ae View commit details
    Browse the repository at this point in the history
Loading