Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings
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: processing/processing
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
Loading
...
head repository: JayDusara/processing
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
Checking mergeability… Don’t worry, you can still create the pull request.
  • 8 commits
  • 8 files changed
  • 1 contributor

Commits on Apr 4, 2015

  1. Merge remote-tracking branch 'upstream/master' 

    Conflicts:
	app/src/processing/app/contrib/ContributionPanel.java
	app/src/processing/app/syntax/JEditTextArea.java
	build/macosx/appbundler.jar
	build/macosx/appbundler/native/main.m
	core/src/processing/core/PGraphics.java
	core/todo.txt
	java/src/processing/mode/java/pdex/JavaTextAreaPainter.java
	todo.txt
    @JayDusara
    JayDusara committed Apr 4, 2015
    Configuration menu
    Copy the full SHA
    0186713 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2015

  1. removing conflicts

    @JayDusara
    JayDusara committed Apr 5, 2015
    Configuration menu
    Copy the full SHA
    761ec1d View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master' 

    Conflicts:
	app/src/processing/app/Mode.java
	app/src/processing/app/PreferencesFrame.java
	app/src/processing/app/Sketch.java
	app/src/processing/app/contrib/ContributionListing.java
	app/src/processing/app/contrib/ContributionManager.java
	app/src/processing/app/contrib/ContributionManagerDialog.java
	app/src/processing/app/contrib/ContributionPanel.java
	app/src/processing/app/contrib/LocalContribution.java
	app/src/processing/app/syntax/JEditTextArea.java
	build/macosx/appbundler.jar
	build/macosx/appbundler/native/main.m
	core/src/processing/core/PGraphics.java
	core/todo.txt
	java/src/processing/mode/java/pdex/JavaTextAreaPainter.java
	todo.txt
    @JayDusara
    JayDusara committed Apr 5, 2015
    Configuration menu
    Copy the full SHA
    239e0eb View commit details
    Browse the repository at this point in the history

  3. code cleanup

    @JayDusara
    JayDusara committed Apr 5, 2015
    Configuration menu
    Copy the full SHA
    50a14e7 View commit details
    Browse the repository at this point in the history

  4. Dont rebuild tree if model is not initialized

    @JayDusara
    JayDusara committed Apr 5, 2015
    Configuration menu
    Copy the full SHA
    cd6834f View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2015

  1. merging changes from original repo

    @JayDusara
    JayDusara committed Apr 10, 2015
    Configuration menu
    Copy the full SHA
    1a6ea90 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master' 

    Conflicts:
	app/src/processing/app/Mode.java
	app/src/processing/app/PreferencesFrame.java
	app/src/processing/app/Sketch.java
	build/macosx/appbundler.jar
	build/shared/lib/defaults.txt
	build/shared/lib/languages/PDE_de.properties
	build/shared/lib/languages/PDE_es.properties
	todo.txt
    @JayDusara
    JayDusara committed Apr 10, 2015
    Configuration menu
    Copy the full SHA
    e941eaf View commit details
    Browse the repository at this point in the history

  3. merging phase 

    Signed-off-by: JayDusara <dusara39@gmail.com>
    @JayDusara
    JayDusara committed Apr 10, 2015
    Configuration menu
    Copy the full SHA
    dce7b5d View commit details
    Browse the repository at this point in the history
Loading
Morty Proxy This is a proxified and sanitized view of the page, visit original site.