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: BlackOrderMod/BlackOrder
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: BlackOrderMod/BlackOrder
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: acePropagandaTagging
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 11 commits
  • 22 files changed
  • 1 contributor

Commits on Apr 23, 2018

  1. Added ace tagging tags

    @AndreasBrostrom
    AndreasBrostrom committed Apr 23, 2018
    Configuration menu
    Copy the full SHA
    49e2264 View commit details
    Browse the repository at this point in the history

  2. Added ace tagging icons

    @AndreasBrostrom
    AndreasBrostrom committed Apr 23, 2018
    Configuration menu
    Copy the full SHA
    01ce42f View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2018

  1. Merge branch 'master' of https://github.com/BlackOrderMod/BlackOrder … 

    …into acePropagandaTagging

# Conflicts:
#	optionals/ace_compat/config.cpp
    @AndreasBrostrom
    AndreasBrostrom committed Apr 28, 2018
    Configuration menu
    Copy the full SHA
    15fceed View commit details
    Browse the repository at this point in the history

  2. Merge update

    @AndreasBrostrom
    AndreasBrostrom committed Apr 28, 2018
    Configuration menu
    Copy the full SHA
    73ac4b2 View commit details
    Browse the repository at this point in the history

  3. Updated naming and adjusted code

    @AndreasBrostrom
    AndreasBrostrom committed Apr 28, 2018
    Configuration menu
    Copy the full SHA
    bd0ce6a View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of https://github.com/BlackOrderMod/BlackOrder … 

    …into acePropagandaTagging
    @AndreasBrostrom
    AndreasBrostrom committed Apr 28, 2018
    Configuration menu
    Copy the full SHA
    fd6fa74 View commit details
    Browse the repository at this point in the history

  5. Adjusted image

    @AndreasBrostrom
    AndreasBrostrom committed Apr 28, 2018
    Configuration menu
    Copy the full SHA
    c417cb1 View commit details
    Browse the repository at this point in the history

  6. fixed stringtable

    @AndreasBrostrom
    AndreasBrostrom committed Apr 28, 2018
    Configuration menu
    Copy the full SHA
    f229ad8 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2018

  1. Adjusted texture

    @AndreasBrostrom
    AndreasBrostrom committed Apr 29, 2018
    Configuration menu
    Copy the full SHA
    fd16141 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2020

  1. Merge branch 'master' into acePropagandaTagging

    @AndreasBrostrom
    AndreasBrostrom authored May 8, 2020
    Configuration menu
    Copy the full SHA
    1be9783 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into acePropagandaTagging

    @AndreasBrostrom
    AndreasBrostrom authored May 8, 2020
    Configuration menu
    Copy the full SHA
    8b89b4c View commit details
    Browse the repository at this point in the history
Loading