diff options
| author | Joakim Verona | 2013-09-11 07:59:34 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-09-11 07:59:34 +0200 |
| commit | a41d9dcfc950458c081f832606dac2081d14c8ae (patch) | |
| tree | 74c0943a6a5cc7691c8357db34d432d279be533b /src/window.c | |
| parent | 46b1dc2856fcfd6222f5320a511fcf0863c9c04c (diff) | |
| download | emacs-a41d9dcfc950458c081f832606dac2081d14c8ae.tar.gz emacs-a41d9dcfc950458c081f832606dac2081d14c8ae.zip | |
fix conflicts
Diffstat (limited to 'src/window.c')
| -rw-r--r-- | src/window.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/window.c b/src/window.c index 5c4527f4671..410015e472e 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -45,15 +45,12 @@ 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 | ||
| 49 | #ifdef HAVE_NS | 48 | #ifdef HAVE_NS |
| 50 | #include "nsterm.h" | 49 | #include "nsterm.h" |
| 51 | #endif | 50 | #endif |
| 52 | #ifdef HAVE_XWIDGETS | 51 | #ifdef HAVE_XWIDGETS |
| 53 | #include "xwidget.h" | 52 | #include "xwidget.h" |
| 54 | #endif | 53 | #endif |
| 55 | ======= | ||
| 56 | >>>>>>> trunk | ||
| 57 | 54 | ||
| 58 | Lisp_Object Qwindowp, Qwindow_live_p; | 55 | Lisp_Object Qwindowp, Qwindow_live_p; |
| 59 | static Lisp_Object Qwindow_valid_p; | 56 | static Lisp_Object Qwindow_valid_p; |