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

Commits on Jun 1, 2017

  1. Added initial snapcraft file

    @vadi2
    vadi2 authored Jun 1, 2017
    Configuration menu
    Copy the full SHA
    6a2bb4c View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2017

  1. Merge branch 'add-snapcraft' of https://github.com/tomcss/Mudlet

    @tomcss
    tomcss committed Jun 11, 2017
    Configuration menu
    Copy the full SHA
    23113b4 View commit details
    Browse the repository at this point in the history

  2. Removed redundant code

    @tomcss
    tomcss committed Jun 11, 2017
    Configuration menu
    Copy the full SHA
    29e2395 View commit details
    Browse the repository at this point in the history

  3. Removed redundant edbee config related code

    @tomcss
    tomcss committed Jun 11, 2017
    Configuration menu
    Copy the full SHA
    6b83c03 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2017

  1. Fixed comments 

    Removed obsolete comment
Added important comment
Fixed typo
    @tomcss
    tomcss authored Jun 12, 2017
    Configuration menu
    Copy the full SHA
    e5e9d57 View commit details
    Browse the repository at this point in the history

  2. Added comment on lexer code

    @tomcss
    tomcss authored Jun 12, 2017
    Configuration menu
    Copy the full SHA
    1c6914d View commit details
    Browse the repository at this point in the history

  3. Delete TScriptEditorManager.h

    @tomcss
    tomcss authored Jun 12, 2017
    Configuration menu
    Copy the full SHA
    3ac6b5f View commit details
    Browse the repository at this point in the history

  4. Delete TScriptEditorManager.cpp

    @tomcss
    tomcss authored Jun 12, 2017
    Configuration menu
    Copy the full SHA
    8fb8052 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2017

  1. Select all search results

    @tomcss
    tomcss committed Jun 13, 2017
    Configuration menu
    Copy the full SHA
    943d51d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into edbee-redundant

    @tomcss
    tomcss committed Jun 13, 2017
    Configuration menu
    Copy the full SHA
    6db1358 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2017

  1. Merge branch 'edbee-redundant' of https://github.com/tomcss/Mudlet in… 

    …to edbee-redundant
    @tomcss
    tomcss committed Jun 14, 2017
    Configuration menu
    Copy the full SHA
    063102c View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1 from Mudlet/development 

    changes
    @tomcss
    tomcss authored Jun 14, 2017
    Configuration menu
    Copy the full SHA
    3a8003a View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2017

  1. removed snapcraft

    @tomcss
    tomcss committed Jun 19, 2017
    Configuration menu
    Copy the full SHA
    89c49c1 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2017

  1. Undone setEnabled change

    @tomcss
    tomcss authored Jun 24, 2017
    Configuration menu
    Copy the full SHA
    6be67b4 View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2017

  1. Update to latest edbee

    @vadi2
    vadi2 committed Jun 30, 2017
    Configuration menu
    Copy the full SHA
    7f3f205 View commit details
    Browse the repository at this point in the history

  2. Restored search behaviour to highlight as before 

    Possibly now that edbee supports it thanks to Rick!
    @vadi2
    vadi2 committed Jun 30, 2017
    Configuration menu
    Copy the full SHA
    e0e7530 View commit details
    Browse the repository at this point in the history

  3. Manually indented in hopes of an easier merge

    @vadi2
    vadi2 committed Jun 30, 2017
    Configuration menu
    Copy the full SHA
    80891b5 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/development' into reenable-searc… 

    …h-highlighting

# Conflicts:
#	src/dlgTriggerEditor.cpp
    @vadi2
    vadi2 committed Jun 30, 2017
    Configuration menu
    Copy the full SHA
    f676ded View commit details
    Browse the repository at this point in the history

  5. Updated edbee

    @vadi2
    vadi2 committed Jun 30, 2017
    Configuration menu
    Copy the full SHA
    ed1f1d3 View commit details
    Browse the repository at this point in the history
Loading