Skip to content

Commit f25da11

Browse files
committed
Merge branches 'fix/irq', 'fix/spelling', 'fix/colors', 'gif', 'roms' and 'debian'
5 parents 7eb9d51 + d2d525e + 4d17cb2 + a0040c4 + ea41ba6 commit f25da11

File tree

679 files changed

+4951
-11913
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

679 files changed

+4951
-11913
lines changed

.gitignore

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -67,16 +67,10 @@ include/libtape/Makefile.in
6767
include/libtape/Makefile
6868
include/sys/Makefile.in
6969
include/sys/Makefile
70-
include/ui/beos/Makefile.in
71-
include/ui/beos/Makefile
7270
include/ui/generic/Makefile.in
7371
include/ui/generic/Makefile
7472
include/ui/gtk/Makefile.in
7573
include/ui/gtk/Makefile
76-
include/ui/sdl/Makefile.in
77-
include/ui/sdl/Makefile
78-
include/ui/sdlmtk/Makefile.in
79-
include/ui/sdlmtk/Makefile
8074
include/ui/Makefile.in
8175
include/ui/Makefile
8276
include/z80core/Makefile.in
@@ -132,24 +126,16 @@ src/libdisk/Makefile.in
132126
src/libdisk/Makefile
133127
src/libtape/Makefile.in
134128
src/libtape/Makefile
135-
src/sys/beos/Makefile.in
136-
src/sys/beos/Makefile
137129
src/sys/linux/Makefile.in
138130
src/sys/linux/Makefile
139131
src/sys/mingw/Makefile.in
140132
src/sys/mingw/Makefile
141133
src/sys/Makefile.in
142134
src/sys/Makefile
143-
src/ui/beos/Makefile.in
144-
src/ui/beos/Makefile
145135
src/ui/generic/Makefile.in
146136
src/ui/generic/Makefile
147137
src/ui/gtk/Makefile.in
148138
src/ui/gtk/Makefile
149-
src/ui/sdl/Makefile.in
150-
src/ui/sdl/Makefile
151-
src/ui/sdlmtk/Makefile.in
152-
src/ui/sdlmtk/Makefile
153139
src/ui/Makefile.in
154140
src/ui/Makefile
155141
src/util/Makefile.in

.pc/.quilt_patches

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
debian/patches

.pc/.quilt_series

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
series

.pc/.version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2

Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ SUBDIRS = \
2222
setup \
2323
po
2424

25-
EXTRA_DIST = VERSION README.de TODO THANKS COPYING COPYING.de
25+
EXTRA_DIST = VERSION README.de TODO THANKS COPYING COPYING.de .pc/.[qv]*
2626

2727
install-data-local:
2828
$(mkinstalldirs) $(DESTDIR)$(docdir)

0 commit comments

Comments
 (0)