~ubuntu-branches/ubuntu/vivid/gnome-panel/vivid

« back to all changes in this revision

Viewing changes to gnome-panel/panel-menu-button.h

  • Committer: Package Import Robot
  • Author(s): Dmitry Shachnev
  • Date: 2014-08-23 18:48:54 UTC
  • mfrom: (1.13.29) (2.1.25 sid)
  • Revision ID: package-import@ubuntu.com-20140823184854-0c8z7pnlzyk4f71i
Tags: 1:3.8.1-1ubuntu1
* Merge with Debian unreleased Svn, remaining changes:
  - Use an epoch in version number.
  - Recommend indicator-applet-complete.
  - Use unity-control-center instead of gnome-control-center.
  - Recommend gnome-screensaver instead of depending on it.
  - Suggest compiz.
  - Adjust Breaks/Replaces for Ubuntu versioning.
  - Drop 14_revert_timedate_change.patch, we are using timedated.
  - Add patches:
    + git_drop_gconf.patch
    + 40_unset_menuproxy.patch
    + 41_classic_layout.patch
    + 50_ubuntu_sessions.patch
    + lp-1314706.patch
    + clock-fix-expanding.patch
* Merge 49_no_screensaver.patch into 50_ubuntu_sessions.patch.
* Drop git_fix_panel_size.patch, applied upstream:
* Refresh patches:
  - git_drop_gconf.patch
  - 40_unset_menuproxy.patch
  - lp-1314706.patch
  - clock-fix-expanding.patch
* Rebase patches:
  - 50_ubuntu_sessions.patch
  - 51_desktop_file.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
14
14
 * General Public License for more details.
15
15
 *
16
16
 * You should have received a copy of the GNU General Public License
17
 
 * along with this program; if not, write to the Free Software
18
 
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
19
 
 * 02111-1307, USA.
 
17
 * along with this program; if not, see <http://www.gnu.org/licenses/>.
20
18
 *
21
19
 * Authors:
22
20
 *      Mark McLoughlin <mark@skynet.ie>