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.

Sign up for GitHub

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

Jump to bottom

Compile fixes, libraries update/consolidation, filled out pokemon lists. #883

Merged
merged 8 commits into from
Jul 27, 2016
Merged

Compile fixes, libraries update/consolidation, filled out pokemon lists. #883

merged 8 commits into from
Jul 27, 2016

Commits on Jul 27, 2016

  1. Compile fixes

    @DeadElle
    DeadElle committed Jul 27, 2016
    Configuration menu
    Copy the full SHA
    9d6e3f5 View commit details
    Browse the repository at this point in the history

  2. Compile fixes v2

    @DeadElle
    DeadElle committed Jul 27, 2016
    Configuration menu
    Copy the full SHA
    6ce9405 View commit details
    Browse the repository at this point in the history

  3. Filled out Pokemon lists

    @DeadElle
    DeadElle committed Jul 27, 2016
    Configuration menu
    Copy the full SHA
    77b7f3c View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of https://github.com/DeadElle/NecroBot

    @DeadElle
    DeadElle committed Jul 27, 2016
    Configuration menu
    Copy the full SHA
    4646b24 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of https://github.com/NecronomiconCoding/NecroBot

    @DeadElle
    DeadElle committed Jul 27, 2016
    Configuration menu
    Copy the full SHA
    bffa151 View commit details
    Browse the repository at this point in the history

  6. IT translation

    @DeadElle
    DeadElle committed Jul 27, 2016
    Configuration menu
    Copy the full SHA
    a364c81 View commit details
    Browse the repository at this point in the history

  7. Merge

    @DeadElle
    DeadElle committed Jul 27, 2016
    Configuration menu
    Copy the full SHA
    9b4759b View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' of https://github.com/NecronomiconCoding/NecroBot

    @DeadElle
    DeadElle committed Jul 27, 2016
    Configuration menu
    Copy the full SHA
    43c624a View commit details
    Browse the repository at this point in the history