diff options
| author | Jeremy Huddleston <jeremyhu@apple.com> | 2012-04-05 11:58:42 -0700 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2012-04-05 11:58:42 -0700 |
| commit | f69b898f1a640e89dd85a434a30dca598fb758f6 (patch) | |
| tree | c874b51a129f416f7cc9dfb7b17ea09ede194bf8 /.gitignore | |
| parent | 7c6d014324486c6dd2fa61e7fa81671c0d508b1d (diff) | |
| parent | dc0096d06db812fe3dd028c62acedf487982b098 (diff) | |
Conflicts:
include/xcwm/xtoq.h
src/libxcwm/context_list.c
src/libxcwm/event_loop.c
src/libxcwm/init.c
src/libxcwm/input.c
src/libxcwm/window.c
src/libxcwm/xcwm.c
src/libxcwm/xcwm_internal.h
src/xtoq/XtoqApplication.h
src/xtoq/XtoqApplication.m
src/xtoq/XtoqController.h
src/xtoq/XtoqController.m
src/xtoq/XtoqImageRep.m
src/xtoq/XtoqView.h
src/xtoq/XtoqView.m
src/xtoq/XtoqWindow.h
src/xtoq/XtoqWindow.m
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -53,3 +53,7 @@ autom4te.cache config.sub depcomp missing + +# Merge and patch files to ignore +*.orig +*.patch
\ No newline at end of file |