← Back to branch summary

~ubuntu-branches/ubuntu/precise/lmms/precise-updates

« back to all changes in this revision

Viewing changes to src/gui/widgets/combobox.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Артём Попов
  • Date: 2011-02-14 20:58:36 UTC
  • mfrom: (1.1.10 upstream) (3.1.9 sid)
  • Revision ID: james.westby@ubuntu.com-20110214205836-2u41xus1d2mj8nfz
Tags: 0.4.10-1ubuntu1
https://launchpad.net/bugs/718801
* Merge from debian unstable (LP: #718801).  Remaining changes:
  - Replace build-dep on libwine-dev with wine1.2-dev to build
    against the newer Wine.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gui/widgets/combobox.cpp
1
1
/*
2
2
 * combobox.cpp - implementation of LMMS-combobox
3
3
 *
4
 
 * Copyright (c) 2006-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
5
 
 * 
 
4
 * Copyright (c) 2006-2010 Tobias Doerffel <tobydox/at/users.sourceforge.net>
 
5
 * Copyright (c) 2008-2009 Paul Giblock <pgib/at/users.sourceforge.net>
 
6
 *
6
7
 * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
7
8
 *
8
9
 * This program is free software; you can redistribute it and/or
33
34
#include <QtGui/QPixmap>
34
35
#include <QtGui/QStyleOptionFrame>
35
36
 
36
 
#include "automation_pattern.h"
37
37
#include "caption_menu.h"
38
38
#include "engine.h"
39
39
#include "embed.h"