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.

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

http -> https #1513

Merged
merged 1 commit into from Nov 14, 2014
Merged

http -> https #1513

merged 1 commit into from Nov 14, 2014

Conversation

Buddybenj
Copy link
Contributor

This removes references to removed features, and changes a couple http to https.

@lioncash
Copy link
Member

lioncash commented Nov 8, 2014

Translation files do not need to be touched. These will be removed automatically the next time we update the Transifex strings via script.

@lioncash
Copy link
Member

lioncash commented Nov 8, 2014

can you squash all of the commits into one commit?

@lioncash
Copy link
Member

lioncash commented Nov 8, 2014

Says you need to do a rebase on master.

@Buddybenj
Copy link
Contributor Author

Sorry, I was in the process of rebasing as you commented :P

@Buddybenj Buddybenj changed the title Small Clean Up http ->https Nov 8, 2014
@Buddybenj Buddybenj changed the title http ->https http -> https Nov 8, 2014
@Buddybenj
Copy link
Contributor Author

OK, I think this should be good.

@@ -22,7 +22,7 @@ Version: 4.0.2
Release: 0%{?dist}
Group: System/Emulators/Other
License: GPL-2.0
URL: http://www.dolphin-emu.org/
URL: https://www.dolphin-emu.org/

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

@Stevoisiak
Copy link
Contributor

@dolphin-emu-bot rebuild

@lioncash
Copy link
Member

Needs a rebase.

@Buddybenj Buddybenj force-pushed the clean-up branch 4 times, most recently from 8a6895e to bd9d2e7 Compare November 13, 2014 22:50
@waddlesplash
Copy link
Contributor

LGTM

@Buddybenj
Copy link
Contributor Author

When I rebased I lost my commits for some reason, but this should be good now.

@pauldacheez
Copy link
Contributor

@Buddybenj FYI, every time you push changes to your branch, our IRC bot spouts a message:
<irrawaddy> [dolphin-emu/dolphin] Buddybenj synchronize pull request #1513: http -> https (master...clean-up): http://goo.gl/ptd5xS
Hold off on pushing changes to your remote until you're completely finished with them locally so irrawaddy doesn't have to spout that line 8+ times.

If I were you, I'd consider reading some documentation and learning how to manually use git from the command line so you know what exactly you're doing instead of just pushing opaque buttons in a UI. (Assuming you're using a UI of some sort, of course. I doubt anyone could mismanage git this badly from the command line.)

@Buddybenj
Copy link
Contributor Author

Whoops, I'll keep that in mind next time. And I was using the command line.

lioncash added a commit that referenced this pull request Nov 14, 2014
@lioncash lioncash merged commit 659c685 into dolphin-emu:master Nov 14, 2014
@Buddybenj Buddybenj deleted the clean-up branch December 7, 2014 15:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
6 participants