[PATCH conductor 0/11] Converge-ui gelato/master merge

Jirka Tomasek jtomasek at redhat.com
Mon Jun 4 16:16:03 UTC 2012


Before you apply onto master, install rubygem-compass and 
rubygem-compass-960-plugin.

Then when you apply the patchset run "git submodule init" and "git 
submodule update"

On 06/04/2012 05:45 PM, Jirka Tomasek wrote:
> This patchset brings converge-ui into master. Patchset reverts reverted gelato branch merge, adds Brian McLaughlin's gelato patches, implements RM 3364, 3368 and partially 3323.
>
> 0001-Revert-Revert-Merge-branch-gelato.patch
> 0002-Unified-UI-converge-ui-changes-to-header-footer-usin.patch
> 0003-Adding-compass-gem-dependancy-and-symbolic-link-for-.patch
> 0004-converge-ui-meeting-updates.patch
> 0005-updated-converge-ui-to-latest-version.patch
> 0006-Added-symlink-for-fonts-removed-fonts-conductor-styl.patch
> 0007-Finishing-touches-in-converge-ui-integration.patch
> 0008-Moved-compass-config-file-to-proper-place-removed-un.patch
> 0009-Removed-Sass-Plugin-scss-compilation-from-developmen.patch
> 0010-Removed-old-favicon-and-added-new-into-public-images.patch
> 0011-rpm-build-changes.patch
>
> Jirka
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.fedorahosted.org/pipermail/aeolus-devel/attachments/20120604/7c9f18ea/attachment.html>


More information about the aeolus-devel mailing list