Skip to content

Instantly share code, notes, and snippets.

@n1zyy

n1zyy/gist:2869969

Created June 4, 2012 18:16
Show Gist options
  • Save n1zyy/2869969 to your computer and use it in GitHub Desktop.
Save n1zyy/2869969 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1.txt
commit 854e33f35b11c358221ecc5f0ddae167c818e816
Author: Jirka Tomasek <[email protected]>
Date: Mon Jun 4 17:45:55 2012 +0200
Converge-ui gelato/master merge
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 3
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
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
</head>
<body bgcolor="#FFFFFF" text="#000000">
<pre><big><big><big><big>This patchset brings converge-ui into master. Patchset reverts reverted gelato branch merge, adds Brian McLaughlin's gelato patches, implements
0001-Revert-Revert-Merge-branch-gelato.patch</big></big></big></big></pre>
<pre><big><big><big><big>0002-Unified-UI-converge-ui-changes-to-header-footer-usin.patch</big></big></big></big></pre>
<pre><big><big><big><big>0003-Adding-compass-gem-dependancy-and-symbolic-link-for-.patch</big></big></big></big></pre>
<pre><big><big><big><big>0004-converge-ui-meeting-updates.patch</big></big></big></big></pre>
<pre><big><big><big><big>0005-updated-converge-ui-to-latest-version.patch</big></big></big></big></pre>
<pre><big><big><big><big>0006-Added-symlink-for-fonts-removed-fonts-conductor-styl.patch</big></big></big></big></pre>
<pre><big><big><big><big>0007-Finishing-touches-in-converge-ui-integration.patch</big></big></big></big></pre>
<pre><big><big><big><big>0008-Moved-compass-config-file-to-proper-place-removed-un.patch</big></big></big></big></pre>
<pre><big><big><big><big>0009-Removed-Sass-Plugin-scss-compilation-from-developmen.patch</big></big></big></big></pre>
<pre><big><big><big><big>0010-Removed-old-favicon-and-added-new-into-public-images.patch</big></big></big></big></pre>
<pre><big><big><big><big>0011-rpm-build-changes.patch
Jirka
</big></big></big></big></pre>
<br>
</body>
</html>
From 389bc5347e9dd56488fdf38dafd2db6cf72cd2d5 Mon Sep 17 00:00:00 2001
From: Jiri Tomasek <[email protected]>
Date: Wed, 23 May 2012 13:44:46 +0200
Subject: [PATCH conductor 01/11] Revert "Revert "Merge branch 'gelato'""
This reverts commit c406ca325092b6ce7f06087556750e65b8037d1f.
Conflicts:
src/Gemfile.lock
Signed-off-by: Matt Wagner <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment