diff options
| author | Joakim Verona | 2013-09-11 07:32:27 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-09-11 07:32:27 +0200 |
| commit | ac845636437cfd96001525f7f090ec0dc336731e (patch) | |
| tree | 2acf242c26504e03f1e5ba53d82358e775c36fdd /src/window.c | |
| parent | 63dae8e97d343fd4ebfe3dc08f0e8dc932630a4c (diff) | |
| parent | 93ef404dc95f947e1c48000a46968fd252781b9d (diff) | |
| download | emacs-ac845636437cfd96001525f7f090ec0dc336731e.tar.gz emacs-ac845636437cfd96001525f7f090ec0dc336731e.zip | |
fix conflicts
Diffstat (limited to 'src/window.c')
| -rw-r--r-- | src/window.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/window.c b/src/window.c index 410015e472e..5c4527f4671 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -45,12 +45,15 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 45 | #ifdef MSDOS | 45 | #ifdef MSDOS |
| 46 | #include "msdos.h" | 46 | #include "msdos.h" |
| 47 | #endif | 47 | #endif |
| 48 | <<<<<<< HEAD | ||
| 48 | #ifdef HAVE_NS | 49 | #ifdef HAVE_NS |
| 49 | #include "nsterm.h" | 50 | #include "nsterm.h" |
| 50 | #endif | 51 | #endif |
| 51 | #ifdef HAVE_XWIDGETS | 52 | #ifdef HAVE_XWIDGETS |
| 52 | #include "xwidget.h" | 53 | #include "xwidget.h" |
| 53 | #endif | 54 | #endif |
| 55 | ======= | ||
| 56 | >>>>>>> trunk | ||
| 54 | 57 | ||
| 55 | Lisp_Object Qwindowp, Qwindow_live_p; | 58 | Lisp_Object Qwindowp, Qwindow_live_p; |
| 56 | static Lisp_Object Qwindow_valid_p; | 59 | static Lisp_Object Qwindow_valid_p; |