Commit ce3cb42e authored by Sebastian Ramacher's avatar Sebastian Ramacher

Import Upstream version 0.9.25.1

parent 9f70e47d
......@@ -25,5 +25,6 @@ Liam Girdwood <liam.girdwood@wolfsonmicro.com> (WM97xx Touchscreen driver)
Brandon M. Reynolds <breynolds@comtime.com> (ELO Touchscreen driver)
Claudio Ciccani <klan82@cheapnet.it> (nVidia gfx driver)
Andreas Oberritter <obi@tuxbox.org> (SiS 315 gfx driver)
Nathanael D. Noblet <nathanael@gnat.ca> (Gunze Touchscreen driver)
See also "Thanks To" section in README.
This diff is collapsed.
......@@ -24,7 +24,8 @@ SUBDIRS = \
interfaces \
$(PROXY_DIR) \
$(LINUXONLY_DIRS) \
patches
patches \
rules
bin_SCRIPTS = directfb-config
......
......@@ -77,6 +77,7 @@ DIRECTFB_MICRO_VERSION = @DIRECTFB_MICRO_VERSION@
DIRECTFB_MINOR_VERSION = @DIRECTFB_MINOR_VERSION@
DIRECTFB_VERSION = @DIRECTFB_VERSION@
DIRECT_BUILD_DEBUG = @DIRECT_BUILD_DEBUG@
DIRECT_BUILD_DEBUGS = @DIRECT_BUILD_DEBUGS@
DIRECT_BUILD_GETTID = @DIRECT_BUILD_GETTID@
DIRECT_BUILD_TEXT = @DIRECT_BUILD_TEXT@
DIRECT_BUILD_TRACE = @DIRECT_BUILD_TRACE@
......@@ -145,7 +146,7 @@ ZLIB_LIBS = @ZLIB_LIBS@
@ENABLE_VOODOO_TRUE@PROXY_DIR = proxy
SUBDIRS = data docs include lib src systems $(TOOLS_DIR) wm interfaces $(PROXY_DIR) $(LINUXONLY_DIRS) patches
SUBDIRS = data docs include lib src systems $(TOOLS_DIR) wm interfaces $(PROXY_DIR) $(LINUXONLY_DIRS) patches rules
bin_SCRIPTS = directfb-config
......@@ -176,7 +177,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
TAR = tar
GZIP_ENV = --best
DIST_SUBDIRS = data docs include lib src systems tools wm interfaces \
proxy inputdrivers gfxdrivers patches
proxy inputdrivers gfxdrivers patches rules
all: all-redirect
.SUFFIXES:
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
......
This diff is collapsed.
......@@ -352,6 +352,12 @@ Thanks to
Mark Adams <mark147m@gmail.com>
Damian Kowalewski <damian.kowalewski@mail.mcgill.ca>
Jakub Bogusz <qboosh@pld-linux.org>
Nathanael D. Noblet <nathanael@gnat.ca>
Ryan Burns <rburns@mvista.com>
Colin Watson <cjwatson@debian.org>
Guillem Jover <guillem@debian.org>
Jeff Bailey <jbailey@ubuntu.com>
Andreas Jochens <aj@andaco.de>
Special thanks to Ville Syrjala for his great work on the
......@@ -378,4 +384,3 @@ Legal stuff
version 2 of the License, or (at your option) any later version.
The complete text of the license is found in the file COPYING.
This diff is collapsed.
This diff is collapsed.
......@@ -36,6 +36,9 @@
/* Define to 1 if you have the `pthread' library (-lpthread). */
#undef HAVE_LIBPTHREAD
/* Define to 1 if you have the <linux/pci_regs.h> header file. */
#undef HAVE_LINUX_PCI_REGS_H
/* Define to 1 if you have the <linux/unistd.h> header file. */
#undef HAVE_LINUX_UNISTD_H
......
......@@ -3,7 +3,7 @@
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
timestamp='2005-04-22'
timestamp='2005-07-08'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
......@@ -21,14 +21,15 @@ timestamp='2005-04-22'
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
# 02110-1301, USA.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
# Please send patches to <config-patches@gnu.org>. Submit a context
# diff and a properly formatted ChangeLog entry.
#
......@@ -83,11 +84,11 @@ Try \`$me --help' for more information."
while test $# -gt 0 ; do
case $1 in
--time-stamp | --time* | -t )
echo "$timestamp" ; exit 0 ;;
echo "$timestamp" ; exit ;;
--version | -v )
echo "$version" ; exit 0 ;;
echo "$version" ; exit ;;
--help | --h* | -h )
echo "$usage"; exit 0 ;;
echo "$usage"; exit ;;
-- ) # Stop option processing
shift; break ;;
- ) # Use stdin as input.
......@@ -99,7 +100,7 @@ while test $# -gt 0 ; do
*local*)
# First pass through any local machine types.
echo $1
exit 0;;
exit ;;
* )
break ;;
......@@ -247,6 +248,7 @@ case $basic_machine in
| mips64vr4100 | mips64vr4100el \
| mips64vr4300 | mips64vr4300el \
| mips64vr5000 | mips64vr5000el \
| mips64vr5900 | mips64vr5900el \
| mipsisa32 | mipsisa32el \
| mipsisa32r2 | mipsisa32r2el \
| mipsisa64 | mipsisa64el \
......@@ -255,13 +257,14 @@ case $basic_machine in
| mipsisa64sr71k | mipsisa64sr71kel \
| mipstx39 | mipstx39el \
| mn10200 | mn10300 \
| ms1 \
| msp430 \
| ns16k | ns32k \
| openrisc | or32 \
| or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
| sparcv8 | sparcv9 | sparcv9b \
......@@ -273,6 +276,9 @@ case $basic_machine in
| z8k)
basic_machine=$basic_machine-unknown
;;
m32c)
basic_machine=$basic_machine-unknown
;;
m6811 | m68hc11 | m6812 | m68hc12)
# Motorola 68HC11/12.
basic_machine=$basic_machine-unknown
......@@ -321,6 +327,7 @@ case $basic_machine in
| mips64vr4100-* | mips64vr4100el-* \
| mips64vr4300-* | mips64vr4300el-* \
| mips64vr5000-* | mips64vr5000el-* \
| mips64vr5900-* | mips64vr5900el-* \
| mipsisa32-* | mipsisa32el-* \
| mipsisa32r2-* | mipsisa32r2el-* \
| mipsisa64-* | mipsisa64el-* \
......@@ -329,6 +336,7 @@ case $basic_machine in
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
| mipstx39-* | mipstx39el-* \
| mmix-* \
| ms1-* \
| msp430-* \
| none-* | np1-* | ns16k-* | ns32k-* \
| orion-* \
......@@ -336,7 +344,7 @@ case $basic_machine in
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
| pyramid-* \
| romp-* | rs6000-* \
| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
| sparclite-* \
......@@ -351,6 +359,8 @@ case $basic_machine in
| ymp-* \
| z8k-*)
;;
m32c-*)
;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
386bsd)
......@@ -761,9 +771,8 @@ case $basic_machine in
basic_machine=hppa1.1-oki
os=-proelf
;;
or32 | or32-*)
openrisc | openrisc-*)
basic_machine=or32-unknown
os=-coff
;;
os400)
basic_machine=powerpc-ibm
......@@ -1089,12 +1098,9 @@ case $basic_machine in
we32k)
basic_machine=we32k-att
;;
sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
basic_machine=sh-unknown
;;
sh64)
basic_machine=sh64-unknown
;;
sparc | sparcv8 | sparcv9 | sparcv9b)
basic_machine=sparc-sun
;;
......@@ -1181,7 +1187,8 @@ case $os in
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
| -skyos* | -haiku*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
......@@ -1199,7 +1206,7 @@ case $os in
os=`echo $os | sed -e 's|nto|nto-qnx|'`
;;
-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
| -windows* | -osx | -abug | -netware* | -os9* | -beos* \
| -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
| -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
;;
-mac*)
......@@ -1388,6 +1395,9 @@ case $basic_machine in
*-be)
os=-beos
;;
*-haiku)
os=-haiku
;;
*-ibm)
os=-aix
;;
......@@ -1559,7 +1569,7 @@ case $basic_machine in
esac
echo $basic_machine$os
exit 0
exit
# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
......
This diff is collapsed.
This diff is collapsed.
......@@ -77,6 +77,7 @@ DIRECTFB_MICRO_VERSION = @DIRECTFB_MICRO_VERSION@
DIRECTFB_MINOR_VERSION = @DIRECTFB_MINOR_VERSION@
DIRECTFB_VERSION = @DIRECTFB_VERSION@
DIRECT_BUILD_DEBUG = @DIRECT_BUILD_DEBUG@
DIRECT_BUILD_DEBUGS = @DIRECT_BUILD_DEBUGS@
DIRECT_BUILD_GETTID = @DIRECT_BUILD_GETTID@
DIRECT_BUILD_TEXT = @DIRECT_BUILD_TEXT@
DIRECT_BUILD_TRACE = @DIRECT_BUILD_TRACE@
......
......@@ -224,7 +224,7 @@ fi
if test "$echo_cflags" = "yes"; then
if test @INCLUDEDIR@ != /usr/include ; then
cflags="-I@INCLUDEDIR@ -D_GNU_SOURCE"
cflags="-I@INCLUDEDIR@"
fi
echo $cflags @THREADFLAGS@
fi
......
%define name directfb
%define version 0.9.24
%define version 0.9.25
%define oname DirectFB
%define libname lib%name
......
......@@ -77,6 +77,7 @@ DIRECTFB_MICRO_VERSION = @DIRECTFB_MICRO_VERSION@
DIRECTFB_MINOR_VERSION = @DIRECTFB_MINOR_VERSION@
DIRECTFB_VERSION = @DIRECTFB_VERSION@
DIRECT_BUILD_DEBUG = @DIRECT_BUILD_DEBUG@
DIRECT_BUILD_DEBUGS = @DIRECT_BUILD_DEBUGS@
DIRECT_BUILD_GETTID = @DIRECT_BUILD_GETTID@
DIRECT_BUILD_TEXT = @DIRECT_BUILD_TEXT@
DIRECT_BUILD_TRACE = @DIRECT_BUILD_TRACE@
......
......@@ -57,6 +57,12 @@ SDL (sdl). Other systems might be added in the future.
.BI fbdev=<device>
Opens the given frame buffer device instead of /dev/fb0.
.TP
.BI busid=<id>
Specify the bus location of the card. The option is only used if DirectFB
doesn't have sysfs support and if unspecified 1:0:0 will be assumed.
Use this option if the driver fails to detect (or incorrectly detects) your card.
.TP
.BI mode=<width>x<height>
Sets the default screen resolution. If unspecified DirectFB will use
......@@ -90,6 +96,10 @@ Starting with zero, negative values force creation of a new
world using the lowest unused session number. This will override
the environment variable "DIRECTFB_SESSION".
.TP
.BI remote=<host>[:<session>]
Select the remote session to connect to.
.TP
.BI primary-layer=<id>
Selects which layer is the "primary layer", default is the first.
......@@ -123,6 +133,11 @@ default.
Enables debug output. This is on by default but you won't see any
debug output unless you compiled DirectFB with debugging support.
.TP
.BI [no-]trace
Enable stack trace support. This is on by default but you won't see any
trcae output unless you compiled DirectFB with trace support.
.TP
.BI log-file=<name>
Write all messages to the specified file.
......@@ -131,6 +146,10 @@ Write all messages to the specified file.
.BI log-udp=<host>:<port>
Send all messages via UDP to the specified host and port.
.TP
.BI fatal-level=<level>
Abort on NONE, ASSERT (default) or ASSUME (incl. assert)
.TP
.BI force-windowed
Forces the primary surface to be a window. This allows to run
......@@ -148,6 +167,11 @@ your graphics card will still be loaded and used to access additional
display layers (if there are any), but all graphics operations will
be performed by the software renderer.
.TP
.BI [no-]dma
Turns DMA acceleration on, if supported by the driver. By default
DMA acceleration is off.
.TP
.BI [no-]sync
Flushes all disk buffers before initializing DirectFB. This can be
......@@ -161,18 +185,19 @@ support for MMX was detected. By default MMX is used if is available
and support for MMX was compiled in.
.TP
.BI [no-]argb-font
Instead of using A8 surfaces (alpha masks), load glyphs into ARGB
surfaces. This uses more memory but some graphics cards do weird
things with A8 surfaces. Try this option if your fonts look strange.
.BI [no-]agp[=mode]
Turns AGP memory support on. The option enables DirectFB using the AGP
memory to extend the amount of video memory available. You can specify
the AGP mode to use (e.g. 1, 2, 4, 8 or 0 to disable agp). By default
AGP memory support is off.
.TP
.BI [no-]a1-font
Instead of using A8 surfaces (alpha masks), load glyphs into A1
surfaces. If the graphics driver doesn't support colorizing + blending
blits, this option will speed up font rendering, but reduce quality.
In general you'll never need this option, because software based A8
fonts are highly optimized and fast enough.
.BI font-format=<format>
Specify the font format to use. Possible values are A1, A8, ARGB, ARGB1555,
ARGB2554, ARGB4444, AiRGB. The default font format is A8 because it is the
only format that ensures high quality, fast rendering and low memory consumption
at the same time. Use this option only if your fonts looks strange or if
font rendering is too slow.
.TP
.BI [no-]sighandler
......@@ -217,6 +242,18 @@ Puts the virtual terminal into graphics mode. This has the advantage
that kernel messages won't show up on your screen while the DirectFB
application is running.
.TP
.BI [no-]vt
Use VT handling code at all?
.TP
.BI mouse-source=<device>
Specify the serial mouse device.
.TP
.BI [no-]mouse-gpm-source
Enables using GPM as mouse input repeater.
.TP
.BI [no-]motion-compression
Usually DirectFB compresses mouse motion events. This means that
......@@ -267,6 +304,10 @@ By default DirectFB shows a mouse cursor when an application makes use
of windows. This option allows to switch the cursor off permanently.
Applications cannot enable it explicitly.
.TP
.BI linux-input-ir-only
Ignore all non-IR Linux Input devices.
.TP
.BI disable-module=<modulename>
Suppress loading of this module. The module name is the filename
......@@ -274,6 +315,10 @@ without the \fBlibdirectfb_\fP prefix and without extension (for
example \fBkeyboard\fP to disable loading of the keyboard input
module).
.TP
.BI wm=<wm>
Specify the window manager to use.
.TP
.BI bg-none
Completely disables background handling. Doesn't make much sense since
......@@ -305,11 +350,20 @@ feature, windows are forced to be either fully opaque or fully
transparent. This is useful if your graphics card doesn't support
alpha-transparent blits.
.TP
.BI [no-]decorations
Enables window decorations if supported by the window manager.
.TP
.BI videoram-limit=<amount>
Limits the amount of Video RAM used by DirectFB. The amount of Video
RAM is specified in Kilobytes.
.TP
.BI agpmem-limit=<amount>
Limits the amount if AGP memory used by DirectFB. The amount of AGP
memory is specified in Kilobytes.
.TP
.BI matrox-tv-standard=[pal|ntsc]
Controls the signal produced by the TV output of Matrox cards.
......@@ -331,6 +385,10 @@ enable additional layers using the second head.
If specified DirectFB will dump the screen contents in PPM format
into this directory when the <Print> key gets pressed.
.TP
.BI unichrome-revision=<revision>
Override the hardware revision number used by the Unichrome driver.
.TP
.BI window-surface-policy=<policy>
Allows to control where window surfaces are stored. Supported values
......
......@@ -8,7 +8,7 @@ all-local: stamp-docs
stamp-docs: $(top_srcdir)/tools/gendoc.pl $(docs_headers) Makefile.am
rootme=`pwd`; \
$(PERL) $(top_srcdir)/tools/gendoc.pl $(docs_headers) \
$(PERL) $(top_srcdir)/tools/gendoc.pl $(DIRECTFB_VERSION) $(docs_headers) \
&& echo timestamp > $$rootme/stamp-docs
distclean-local:
......
......@@ -77,6 +77,7 @@ DIRECTFB_MICRO_VERSION = @DIRECTFB_MICRO_VERSION@
DIRECTFB_MINOR_VERSION = @DIRECTFB_MINOR_VERSION@
DIRECTFB_VERSION = @DIRECTFB_VERSION@
DIRECT_BUILD_DEBUG = @DIRECT_BUILD_DEBUG@
DIRECT_BUILD_DEBUGS = @DIRECT_BUILD_DEBUGS@
DIRECT_BUILD_GETTID = @DIRECT_BUILD_GETTID@
DIRECT_BUILD_TEXT = @DIRECT_BUILD_TEXT@
DIRECT_BUILD_TRACE = @DIRECT_BUILD_TRACE@
......@@ -247,7 +248,7 @@ all-local: stamp-docs
stamp-docs: $(top_srcdir)/tools/gendoc.pl $(docs_headers) Makefile.am
rootme=`pwd`; \
$(PERL) $(top_srcdir)/tools/gendoc.pl $(docs_headers) \
$(PERL) $(top_srcdir)/tools/gendoc.pl $(DIRECTFB_VERSION) $(docs_headers) \
&& echo timestamp > $$rootme/stamp-docs
distclean-local:
......
......@@ -90,12 +90,6 @@ else
UNICHROME_DIR =
endif
if GFX_R200
R200_DIR = r200
else
R200_DIR =
endif
SUBDIRS = \
$(ATI_DIR) \
$(RADEON_DIR) \
......@@ -111,6 +105,4 @@ SUBDIRS = \
$(I830_DIR) \
$(CLE266_DIR) \
$(UNICHROME_DIR) \
$(GEODE_DIR) \
$(R200_DIR)
$(GEODE_DIR)
......@@ -77,6 +77,7 @@ DIRECTFB_MICRO_VERSION = @DIRECTFB_MICRO_VERSION@
DIRECTFB_MINOR_VERSION = @DIRECTFB_MINOR_VERSION@
DIRECTFB_VERSION = @DIRECTFB_VERSION@
DIRECT_BUILD_DEBUG = @DIRECT_BUILD_DEBUG@
DIRECT_BUILD_DEBUGS = @DIRECT_BUILD_DEBUGS@
DIRECT_BUILD_GETTID = @DIRECT_BUILD_GETTID@
DIRECT_BUILD_TEXT = @DIRECT_BUILD_TEXT@
DIRECT_BUILD_TRACE = @DIRECT_BUILD_TRACE@
......@@ -168,10 +169,8 @@ ZLIB_LIBS = @ZLIB_LIBS@
@GFX_CLE266_FALSE@CLE266_DIR =
@GFX_UNICHROME_TRUE@UNICHROME_DIR = unichrome
@GFX_UNICHROME_FALSE@UNICHROME_DIR =
@GFX_R200_TRUE@R200_DIR = r200
@GFX_R200_FALSE@R200_DIR =
SUBDIRS = $(ATI_DIR) $(RADEON_DIR) $(CYBER5K_DIR) $(MACH64_DIR) $(MATROX_DIR) $(TDFX_DIR) $(NVIDIA_DIR) $(NEOMAGIC_DIR) $(SAVAGE_DIR) $(SIS315_DIR) $(I810_DIR) $(I830_DIR) $(CLE266_DIR) $(UNICHROME_DIR) $(GEODE_DIR) $(R200_DIR)
SUBDIRS = $(ATI_DIR) $(RADEON_DIR) $(CYBER5K_DIR) $(MACH64_DIR) $(MATROX_DIR) $(TDFX_DIR) $(NVIDIA_DIR) $(NEOMAGIC_DIR) $(SAVAGE_DIR) $(SIS315_DIR) $(I810_DIR) $(I830_DIR) $(CLE266_DIR) $(UNICHROME_DIR) $(GEODE_DIR)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../config.h
......@@ -184,7 +183,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
TAR = tar
GZIP_ENV = --best
DIST_SUBDIRS = ati128 radeon cyber5k mach64 matrox tdfx nvidia neomagic \
savage sis315 i810 i830 cle266 unichrome nsc r200
savage sis315 i810 i830 cle266 unichrome nsc
all: all-redirect
.SUFFIXES:
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
This diff is collapsed.
This diff is collapsed.
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
......@@ -53,7 +53,7 @@ typedef struct _UcOverlayData {
bool uc_ovl_map_vzoom(int sh, int dh, __u32* zoom, __u32* mini);
bool uc_ovl_map_hzoom(int sw, int dw, __u32* zoom, __u32* mini,
int* falign, int* dcount);
__u32* falign, __u32* dcount);
__u32 uc_ovl_map_qwpitch(int falign, DFBSurfacePixelFormat format, int sw);
__u32 uc_ovl_map_format(DFBSurfacePixelFormat format);
void uc_ovl_map_window(int scrw, int scrh, DFBRectangle* win, int sw, int sh,
......
This diff is collapsed.
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.