search

frakbot / FWeather

A weather widget for Android based upon Tobias van Scheider's Authentic Weather design.
https://play.google.com/store/apps/details?id=net.frakbot.FWeather
92 stars 34 forks source link

Update docs and compress images more #71

Closed XhmikosR closed 10 years ago

rock3r commented 10 years ago

I've changed a couple of things on the README and merged. Thanks!

XhmikosR commented 10 years ago

You basically reverted all my README changes from what I can tell.

XhmikosR commented 10 years ago

Even the typo fixes and everything.

Oh well, I made my contribution, you chose to revert it so it's your own decision.

For reference, this is a revert of your patch, which is basically my original patch.

rock3r commented 10 years ago

That wasn't my intention. The history has somehow been messed up between merges; I actually had your version of the README with a couple of tweaks in place. Don't know what happened, I'm restoring the right version.

rock3r commented 10 years ago

Fixed again as of 5a39cad

XhmikosR commented 10 years ago

OK, I thought it was done on purpose since it was a clear revert.

rock3r commented 10 years ago

I did a revert, because it was easier to merge into develop first and then manually re-.apply the changes :) But then I had a commit with all the changes, that was somehow lost in the merge. I have no idea how.

XhmikosR commented 10 years ago

git can be tricky sometimes, unfortunately. No worries :)