No description provided.
chromium: fix build problem with linker
emacs-bzr: Add back to moonbase
bzrtools: add back to moonbase, version bump to 2.5
nethack: add back to moonbase
libflashsupport-git: add back to moonbase
paprefs/pavucontrol: add back to moonbase
Merge remote-tracking branch 'upstream/master'
this contains a HUUUGE merge change, which is way too much. The 6 separate commits are fine, but you need to rebase before sending a pull request. As is, the merge commit is too big to accept.
I'm not a git expert, and don't understand what I should do. Googling git rebase isn't proving terribly helpful.
yeah, we need to document this somehow. do you at least see that in github your request shows a huuuuge merge commit?
I did a manual pull/merge and that fixed it up, so, your changes are in at least.
I tried to use git rebase, but I seem to just have made it worse if you look at my commit log. =(
At least it's fixed now.