Oops, sorry, I think we got some wires crossed with these branches. :P
The calref branch contains the site-specific stuff relative to master (basically just calref-install.sh, since we no longer have a splash page) and shouldn't be merged back into it.
New ponicons are added to master and then merged into calref.
I cherry-picked a few commits and everything should be fine now. :)
The master branch has your new emote commits, the calref branch is merged from that and also has your calref-install.sh commit. It's basically exactly the same code (apart from taking calref-install.sh back out of master), just the commit tree is different.
(You may need to pull --rebase your local branches.)
Oops, sorry, I think we got some wires crossed with these branches. :P
The
calrefbranch contains the site-specific stuff relative tomaster(basically justcalref-install.sh, since we no longer have a splash page) and shouldn't be merged back into it. New ponicons are added tomasterand then merged intocalref.I cherry-picked a few commits and everything should be fine now. :) The
masterbranch has your new emote commits, thecalrefbranch is merged from that and also has yourcalref-install.shcommit. It's basically exactly the same code (apart from takingcalref-install.shback out ofmaster), just the commit tree is different. (You may need to pull --rebase your local branches.)