diff options
| author | Joakim Verona <joakim@verona.se> | 2013-09-11 07:32:27 +0200 |
|---|---|---|
| committer | Joakim Verona <joakim@verona.se> | 2013-09-11 07:32:27 +0200 |
| commit | ac845636437cfd96001525f7f090ec0dc336731e (patch) | |
| tree | 2acf242c26504e03f1e5ba53d82358e775c36fdd /src/emacsgtkfixed.h | |
| parent | 63dae8e97d343fd4ebfe3dc08f0e8dc932630a4c (diff) | |
| parent | 93ef404dc95f947e1c48000a46968fd252781b9d (diff) | |
| download | emacs-ac845636437cfd96001525f7f090ec0dc336731e.tar.gz | |
fix conflicts
Diffstat (limited to 'src/emacsgtkfixed.h')
| -rw-r--r-- | src/emacsgtkfixed.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/emacsgtkfixed.h b/src/emacsgtkfixed.h index 4cea0b23332..c7468e39c7b 100644 --- a/src/emacsgtkfixed.h +++ b/src/emacsgtkfixed.h @@ -25,6 +25,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ G_BEGIN_DECLS +<<<<<<< HEAD struct frame; #define EMACS_TYPE_FIXED (emacs_fixed_get_type ()) @@ -52,6 +53,8 @@ struct _EmacsFixedClass GtkFixedClass parent_class; }; +======= +>>>>>>> trunk extern GtkWidget *emacs_fixed_new (struct frame *f); extern GType emacs_fixed_get_type (void); |