Sync with trunk revision 64099.
authorHermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
Tue, 9 Sep 2014 23:20:40 +0000 (23:20 +0000)
committerHermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
Tue, 9 Sep 2014 23:20:40 +0000 (23:20 +0000)
svn path=/branches/condrv_restructure/; revision=64100

404 files changed:
1  2 
base/applications/calc/CMakeLists.txt
base/applications/calc/lang/tr-TR.rc
base/applications/cmdutils/doskey/doskey.rc
base/applications/cmdutils/doskey/lang/ru-RU.rc
base/applications/cmdutils/find/lang/ru-RU.rc
base/applications/cmdutils/help/lang/ru-RU.rc
base/applications/cmdutils/hostname/hostname.rc
base/applications/cmdutils/hostname/lang/ru-RU.rc
base/applications/cmdutils/more/lang/ru-RU.rc
base/applications/cmdutils/reg/lang/ru-RU.rc
base/applications/cmdutils/taskkill/lang/ru-RU.rc
base/applications/cmdutils/taskkill/taskkill.rc
base/applications/cmdutils/wmic/lang/ru-RU.rc
base/applications/cmdutils/wmic/wmic.rc
base/applications/cmdutils/xcopy/lang/Ru.rc
base/applications/dxdiag/lang/tr-TR.rc
base/applications/findstr/lang/ru-RU.rc
base/applications/games/winmine/lang/ru-RU.rc
base/applications/mplay32/lang/bg-BG.rc
base/applications/mplay32/lang/cs-CZ.rc
base/applications/mplay32/lang/de-DE.rc
base/applications/mplay32/lang/en-US.rc
base/applications/mplay32/lang/es-ES.rc
base/applications/mplay32/lang/fr-FR.rc
base/applications/mplay32/lang/he-IL.rc
base/applications/mplay32/lang/it-IT.rc
base/applications/mplay32/lang/ja-JP.rc
base/applications/mplay32/lang/nl-NL.rc
base/applications/mplay32/lang/no-NO.rc
base/applications/mplay32/lang/pl-PL.rc
base/applications/mplay32/lang/pt-BR.rc
base/applications/mplay32/lang/ro-RO.rc
base/applications/mplay32/lang/ru-RU.rc
base/applications/mplay32/lang/sk-SK.rc
base/applications/mplay32/lang/sq-AL.rc
base/applications/mplay32/lang/sv-SE.rc
base/applications/mplay32/lang/tr-TR.rc
base/applications/mplay32/lang/uk-UA.rc
base/applications/mplay32/lang/zh-CN.rc
base/applications/mplay32/lang/zh-TW.rc
base/applications/mplay32/mplay32.c
base/applications/mplay32/resource.h
base/applications/mscutils/eventvwr/eventvwr.c
base/applications/mscutils/eventvwr/lang/bg-BG.rc
base/applications/mscutils/eventvwr/lang/cs-CZ.rc
base/applications/mscutils/eventvwr/lang/de-DE.rc
base/applications/mscutils/eventvwr/lang/el-GR.rc
base/applications/mscutils/eventvwr/lang/en-US.rc
base/applications/mscutils/eventvwr/lang/es-ES.rc
base/applications/mscutils/eventvwr/lang/fr-FR.rc
base/applications/mscutils/eventvwr/lang/he-IL.rc
base/applications/mscutils/eventvwr/lang/it-IT.rc
base/applications/mscutils/eventvwr/lang/ja-JP.rc
base/applications/mscutils/eventvwr/lang/ko-KR.rc
base/applications/mscutils/eventvwr/lang/no-NO.rc
base/applications/mscutils/eventvwr/lang/pl-PL.rc
base/applications/mscutils/eventvwr/lang/pt-BR.rc
base/applications/mscutils/eventvwr/lang/ro-RO.rc
base/applications/mscutils/eventvwr/lang/ru-RU.rc
base/applications/mscutils/eventvwr/lang/sk-SK.rc
base/applications/mscutils/eventvwr/lang/sq-AL.rc
base/applications/mscutils/eventvwr/lang/sv-SE.rc
base/applications/mscutils/eventvwr/lang/tr-TR.rc
base/applications/mscutils/eventvwr/lang/uk-UA.rc
base/applications/mscutils/eventvwr/lang/zh-CN.rc
base/applications/mscutils/eventvwr/resource.h
base/applications/mscutils/servman/lang/tr-TR.rc
base/applications/network/ping/lang/ru-RU.rc
base/applications/network/ping/ping.rc
base/applications/rapps/lang/ru-RU.rc
base/applications/rapps/rapps/abyss.txt
base/applications/rapps/rapps/ants.txt
base/applications/rapps/rapps/dvdwritenow.txt
base/applications/rapps/rapps/libreoffice.txt
base/applications/rapps/rapps/openoffice.txt
base/applications/rapps/rapps/openoffice2.4.txt
base/applications/rapps/rapps/reshack.txt
base/applications/rapps/rapps/rocks.txt
base/applications/rapps/rapps/rosbe.txt
base/applications/rapps/rapps/rosbeamd64.txt
base/applications/rapps/rapps/rosbearm.txt
base/applications/regedit/clb/lang/tr-TR.rc
base/applications/regedit/lang/tr-TR.rc
base/applications/shutdown/lang/ru-RU.rc
base/applications/sndrec32/lang/tr-TR.rc
base/applications/taskmgr/CMakeLists.txt
base/applications/taskmgr/applpage.c
base/applications/taskmgr/lang/bg-BG.rc
base/applications/taskmgr/lang/cs-CZ.rc
base/applications/taskmgr/lang/da-DK.rc
base/applications/taskmgr/lang/de-DE.rc
base/applications/taskmgr/lang/el-GR.rc
base/applications/taskmgr/lang/en-US.rc
base/applications/taskmgr/lang/es-ES.rc
base/applications/taskmgr/lang/fr-FR.rc
base/applications/taskmgr/lang/he-IL.rc
base/applications/taskmgr/lang/hu-HU.rc
base/applications/taskmgr/lang/id-ID.rc
base/applications/taskmgr/lang/it-IT.rc
base/applications/taskmgr/lang/ja-JP.rc
base/applications/taskmgr/lang/ko-KR.rc
base/applications/taskmgr/lang/nl-NL.rc
base/applications/taskmgr/lang/no-NO.rc
base/applications/taskmgr/lang/pl-PL.rc
base/applications/taskmgr/lang/pt-BR.rc
base/applications/taskmgr/lang/ro-RO.rc
base/applications/taskmgr/lang/ru-RU.rc
base/applications/taskmgr/lang/sk-SK.rc
base/applications/taskmgr/lang/sq-AL.rc
base/applications/taskmgr/lang/sv-SE.rc
base/applications/taskmgr/lang/tr-TR.rc
base/applications/taskmgr/lang/uk-UA.rc
base/applications/taskmgr/lang/zh-CN.rc
base/applications/taskmgr/lang/zh-TW.rc
base/applications/taskmgr/perfpage.c
base/applications/taskmgr/precomp.h
base/applications/taskmgr/procpage.c
base/applications/taskmgr/resource.h
base/applications/taskmgr/shutdown.c
base/applications/taskmgr/shutdown.h
base/applications/taskmgr/taskmgr.c
base/applications/taskmgr/taskmgr.h
base/services/eventlog/eventlog.h
base/services/eventlog/file.c
base/services/eventlog/rpc.c
base/setup/usetup/interface/usetup.c
base/setup/usetup/lang/cs-CZ.h
base/setup/usetup/lang/pl-PL.h
base/setup/usetup/lang/tr-TR.h
base/setup/usetup/usetup.h
base/shell/cmd/lang/ru-RU.rc
base/system/smss/smss.h
base/system/winlogon/lang/tr-TR.rc
base/system/winlogon/sas.c
boot/bootdata/hivedef.inf
boot/bootdata/hivesft.inf
boot/bootdata/hivesys.inf
boot/bootdata/packages/reactos.dff.in
boot/freeldr/freeldr/arch/i386/hwpci.c
cmake/CMakeMacros.cmake
cmake/gcc.cmake
cmake/msvc.cmake
dll/cpl/access/lang/tr-TR.rc
dll/cpl/desk/general.c
dll/cpl/desk/screensaver.c
dll/cpl/input/lang/tr-TR.rc
dll/cpl/intl/lang/tr-TR.rc
dll/cpl/liccpa/lang/tr-TR.rc
dll/cpl/main/lang/tr-TR.rc
dll/cpl/mmsys/lang/tr-TR.rc
dll/cpl/sysdm/lang/tr-TR.rc
dll/directx/wine/dplay/CMakeLists.txt
dll/directx/wine/quartz/filtermapper.c
dll/opengl/mesa/main/format_unpack.c
dll/opengl/mesa/main/get.c
dll/opengl/mesa/swrast/s_aatriangle.c
dll/opengl/mesa/swrast/s_span.c
dll/opengl/mesa/swrast/s_texfetch.c
dll/opengl/mesa/swrast/s_texfilter.c
dll/opengl/mesa/tnl/t_draw.c
dll/win32/browseui/lang/ru-RU.rc
dll/win32/comdlg32/lang/cdlg_Ru.rc
dll/win32/crypt32/lang/crypt32_Tr.rc
dll/win32/crypt32/rootstore.c
dll/win32/cryptui/cryptui.rc
dll/win32/cryptui/lang/cryptui_Ru.rc
dll/win32/dbghelp/compat.c
dll/win32/devmgr/lang/fr-FR.rc
dll/win32/devmgr/lang/ru-RU.rc
dll/win32/getuname/lang/en-US.rc
dll/win32/getuname/lang/ro-RO.rc
dll/win32/getuname/lang/sq-AL.rc
dll/win32/hhctrl.ocx/lang/Ru.rc
dll/win32/jscript/lang/jscript_Tr.rc
dll/win32/kernel32/client/file/mailslot.c
dll/win32/kernel32/client/file/npipe.c
dll/win32/kernel32/client/power.c
dll/win32/kernel32/client/utils.c
dll/win32/kernel32/client/vista.c
dll/win32/kernel32/winnls/lang/ru-RU.mc
dll/win32/kernel32/winnls/lang/tr-TR.rc
dll/win32/kernel32/winnls/nls/trk.nls
dll/win32/lsasrv/lang/tr-TR.rc
dll/win32/lsasrv/lsasrv.rc
dll/win32/mapi32/lang/Tr.rc
dll/win32/mapi32/version.rc
dll/win32/modemui/lang/tr-TR.rc
dll/win32/modemui/modemui.rc
dll/win32/mpr/lang/mpr_Tr.rc
dll/win32/msacm32/lang/msacm_Tr.rc
dll/win32/mscoree/corruntimehost.c
dll/win32/mshtml/lang/Ru.rc
dll/win32/msi/msi_Tr.rc
dll/win32/msports/lang/ru-RU.rc
dll/win32/msports/lang/tr-TR.rc
dll/win32/msports/msports.rc
dll/win32/netapi32/user.c
dll/win32/netcfgx/lang/ru-RU.rc
dll/win32/netcfgx/lang/tr-TR.rc
dll/win32/netcfgx/netcfgx.rc
dll/win32/netid/lang/ru-RU.rc
dll/win32/netid/lang/tr-TR.rc
dll/win32/netid/netid.rc
dll/win32/netshell/lang/ru-RU.rc
dll/win32/netshell/lang/tr-TR.rc
dll/win32/netshell/netshell.rc
dll/win32/newdev/lang/tr-TR.rc
dll/win32/newdev/newdev.rc
dll/win32/ole32/compobj.c
dll/win32/oleacc/lang/oleacc_Ru.rc
dll/win32/oleacc/lang/oleacc_Tr.rc
dll/win32/oleacc/oleacc.rc
dll/win32/oledlg/lang/oledlg_Ru.rc
dll/win32/rpcrt4/ndr_marshall.c
dll/win32/rpcrt4/rpc_transport.c
dll/win32/samsrv/lang/ru-RU.rc
dll/win32/samsrv/samsrv.rc
dll/win32/schannel/CMakeLists.txt
dll/win32/schannel/msvc_typeof_hack.h
dll/win32/schannel/precomp.h
dll/win32/schannel/schannel.spec
dll/win32/schannel/schannel_gnutls.c
dll/win32/schannel/schannel_main.c
dll/win32/schannel/schannel_priv.h
dll/win32/schannel/schannel_wine.c
dll/win32/schannel/secur32_wine.c
dll/win32/schannel/stubs.c
dll/win32/secur32/CMakeLists.txt
dll/win32/secur32/precomp.h
dll/win32/secur32/secur32.spec
dll/win32/secur32/secur32_priv.h
dll/win32/secur32/sspi.c
dll/win32/secur32/thunks.c
dll/win32/secur32/thunks.h
dll/win32/secur32/wrapper.c
dll/win32/shell32/defcontextmenu.cpp
dll/win32/shell32/folders/fonts.cpp
dll/win32/shell32/folders/fs.cpp
dll/win32/shell32/folders/recyclebin.cpp
dll/win32/shell32/lang/ru-RU.rc
dll/win32/urlmon/urlmon.inf
dll/win32/urlmon/urlmon.spec
dll/win32/winhttp/request.c
dll/win32/wininet/http.c
dll/win32/winmm/lang/winmm_Ru.rc
dll/win32/wldap32/lang/wldap32_Ru.rc
drivers/base/bootvid/arm/bootdata.c
drivers/base/bootvid/arm/bootvid.c
drivers/base/bootvid/i386/bootvid.c
drivers/base/bootvid/i386/vga.c
drivers/base/bootvid/precomp.h
drivers/filesystems/fastfat/CMakeLists.txt
drivers/filesystems/fastfat/fcb.c
drivers/filesystems/fastfat/fsctl.c
drivers/filesystems/fastfat/rw.c
drivers/filesystems/fastfat/vfat.h
drivers/storage/ide/uniata/atapi.h
drivers/storage/ide/uniata/bm_devs.h
drivers/storage/ide/uniata/config.h
drivers/storage/ide/uniata/id_ata.cpp
drivers/storage/ide/uniata/id_dma.cpp
drivers/storage/ide/uniata/id_init.cpp
drivers/storage/ide/uniata/id_sata.cpp
drivers/storage/ide/uniata/id_sata.h
drivers/storage/ide/uniata/uniata_ver.h
drivers/storage/scsiport/scsiport.c
drivers/usb/usbhub/fdo.c
hal/CMakeLists.txt
hal/halarm/CMakeLists.txt
hal/halx86/legacy/bus/pci_classes.ids
hal/halx86/legacy/bus/pci_vendors.ids
include/crt/crtdefs.h
include/crt/mingw32/intrin_x86.h
include/crt/stdlib.h
include/ddk/ntstrsafe.h
include/ddk/wdm.h
include/ndk/inbvfuncs.h
include/psdk/intsafe.h
include/psdk/ntdef.h
include/psdk/winbase.h
include/psdk/winnt.h
include/reactos/drivers/bootvid/bootvid.h
include/reactos/libs/gnutls/gmp.h
include/reactos/libs/gnutls/gnutls/abstract.h
include/reactos/libs/gnutls/gnutls/compat.h
include/reactos/libs/gnutls/gnutls/crypto.h
include/reactos/libs/gnutls/gnutls/dtls.h
include/reactos/libs/gnutls/gnutls/gnutls.h
include/reactos/libs/gnutls/gnutls/gnutlsxx.h
include/reactos/libs/gnutls/gnutls/ocsp.h
include/reactos/libs/gnutls/gnutls/openpgp.h
include/reactos/libs/gnutls/gnutls/pkcs11.h
include/reactos/libs/gnutls/gnutls/pkcs12.h
include/reactos/libs/gnutls/gnutls/tpm.h
include/reactos/libs/gnutls/gnutls/x509.h
include/reactos/libs/gnutls/gnutls/xssl.h
include/reactos/libs/gnutls/nettle/aes.h
include/reactos/libs/gnutls/nettle/arcfour.h
include/reactos/libs/gnutls/nettle/arctwo.h
include/reactos/libs/gnutls/nettle/asn1.h
include/reactos/libs/gnutls/nettle/base16.h
include/reactos/libs/gnutls/nettle/base64.h
include/reactos/libs/gnutls/nettle/bignum.h
include/reactos/libs/gnutls/nettle/blowfish.h
include/reactos/libs/gnutls/nettle/buffer.h
include/reactos/libs/gnutls/nettle/camellia.h
include/reactos/libs/gnutls/nettle/cast128.h
include/reactos/libs/gnutls/nettle/cbc.h
include/reactos/libs/gnutls/nettle/ctr.h
include/reactos/libs/gnutls/nettle/des-compat.h
include/reactos/libs/gnutls/nettle/des.h
include/reactos/libs/gnutls/nettle/dsa.h
include/reactos/libs/gnutls/nettle/ecc-curve.h
include/reactos/libs/gnutls/nettle/ecc.h
include/reactos/libs/gnutls/nettle/ecdsa.h
include/reactos/libs/gnutls/nettle/gcm.h
include/reactos/libs/gnutls/nettle/gosthash94.h
include/reactos/libs/gnutls/nettle/hmac.h
include/reactos/libs/gnutls/nettle/knuth-lfib.h
include/reactos/libs/gnutls/nettle/macros.h
include/reactos/libs/gnutls/nettle/md2.h
include/reactos/libs/gnutls/nettle/md4.h
include/reactos/libs/gnutls/nettle/md5-compat.h
include/reactos/libs/gnutls/nettle/md5.h
include/reactos/libs/gnutls/nettle/memxor.h
include/reactos/libs/gnutls/nettle/nettle-meta.h
include/reactos/libs/gnutls/nettle/nettle-stdint.h
include/reactos/libs/gnutls/nettle/nettle-types.h
include/reactos/libs/gnutls/nettle/pbkdf2.h
include/reactos/libs/gnutls/nettle/pgp.h
include/reactos/libs/gnutls/nettle/pkcs1.h
include/reactos/libs/gnutls/nettle/realloc.h
include/reactos/libs/gnutls/nettle/ripemd160.h
include/reactos/libs/gnutls/nettle/rsa-compat.h
include/reactos/libs/gnutls/nettle/rsa.h
include/reactos/libs/gnutls/nettle/salsa20.h
include/reactos/libs/gnutls/nettle/serpent.h
include/reactos/libs/gnutls/nettle/sexp.h
include/reactos/libs/gnutls/nettle/sha.h
include/reactos/libs/gnutls/nettle/sha1.h
include/reactos/libs/gnutls/nettle/sha2.h
include/reactos/libs/gnutls/nettle/sha3.h
include/reactos/libs/gnutls/nettle/twofish.h
include/reactos/libs/gnutls/nettle/umac.h
include/reactos/libs/gnutls/nettle/yarrow.h
include/reactos/libs/gnutls/p11-kit/deprecated.h
include/reactos/libs/gnutls/p11-kit/iter.h
include/reactos/libs/gnutls/p11-kit/p11-kit.h
include/reactos/libs/gnutls/p11-kit/pin.h
include/reactos/libs/gnutls/p11-kit/pkcs11.h
include/reactos/libs/gnutls/p11-kit/uri.h
include/reactos/libs/pseh/pseh2.h
include/reactos/libs/pseh/pseh3.h
include/reactos/wine/config.h
include/reactos/wine/list.h
include/xdk/generate.bat
include/xdk/interlocked.h
include/xdk/ntbasedef.h
include/xdk/ntdef.template.h
include/xdk/winnt.template.h
include/xdk/winnt_old.h
lib/3rdparty/libsamplerate/float_cast.h
lib/cmlib/hiveinit.c
lib/fslib/ext2lib/Disk.c
lib/pseh/arm/seh_prolog.s
lib/pseh/i386/pseh3.c
lib/pseh/i386/pseh3_asmdef.h
lib/pseh/i386/pseh3_i386.S
lib/rtl/actctx.c
lib/rtl/path.c
lib/sdk/crt/crt.cmake
lib/sdk/crt/math/i386/ldexp.c
lib/sdk/crt/printf/_sxprintf.c
lib/sdk/crt/printf/streamout.c
lib/sdk/crt/stdio/popen.c
media/doc/For_Turkish_Translators.txt
media/doc/README.WINE
media/doc/Romanian translation notes.txt
media/fonts/UniVGA16.ttf
ntoskrnl/cache/section/data.c
ntoskrnl/cc/copy.c
ntoskrnl/cc/view.c
ntoskrnl/config/cminit.c
ntoskrnl/inbv/inbv.c
ntoskrnl/include/internal/cc.h
ntoskrnl/lpc/reply.c
ntoskrnl/mm/ARM3/expool.c
ntoskrnl/mm/ARM3/pagfault.c
ntoskrnl/mm/ARM3/section.c
ntoskrnl/mm/ARM3/virtual.c
ntoskrnl/mm/section.c
ntoskrnl/ntos.cmake
ntoskrnl/ob/obhandle.c
ntoskrnl/po/power.c
ntoskrnl/vf/driver.c
toolchain-clang.cmake
win32ss/drivers/videoprt/dispatch.c
win32ss/gdi/gdi32/include/gdi32p.h
win32ss/gdi/gdi32/objects/brush.c
win32ss/gdi/gdi32/objects/region.c
win32ss/gdi/ntgdi/freetype.c
win32ss/user/ntuser/windc.c
win32ss/user/user32/windows/menu.c
win32ss/user/user32/windows/spy.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc cmake/gcc.cmake
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 0000000,a827298..a827298
mode 000000,100644..100644
--- /dev/null
Simple merge
index 0000000,a58442e..a58442e
mode 000000,100644..100644
--- /dev/null
Simple merge
index 0000000,a41ddb9..a41ddb9
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 0000000,84c7862..84c7862
mode 000000,100644..100644
--- /dev/null
index 0000000,c1eedc9..c1eedc9
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
index 0000000,8ab4c98..8ab4c98
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
index 0000000,bfcd7df..bfcd7df
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
index 0000000,8c6635c..8c6635c
mode 000000,100644..100644
--- /dev/null
Simple merge
index 0000000,00192ef..00192ef
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 0000000,ce97689..ce97689
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 0000000,48ba2c9..48ba2c9
mode 000000,100644..100644
--- /dev/null
index 0000000,dd6fe1a..dd6fe1a
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
index 0000000,6c675ae..6c675ae
mode 000000,100644..100644
--- /dev/null
Simple merge
index 0000000,6fc7258..6fc7258
mode 000000,100644..100644
--- /dev/null
index 0000000,7c3171e..7c3171e
mode 000000,100644..100644
--- /dev/null
index 0000000,882144c..882144c
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 0000000,c04c824..c04c824
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 0000000,c40699b..c40699b
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 0000000,130742a..130742a
mode 000000,100644..100644
--- /dev/null
index 0000000,fc1df37..fc1df37
mode 000000,100644..100644
--- /dev/null
index 0000000,7d948e0..7d948e0
mode 000000,100644..100644
--- /dev/null
index 0000000,a8221d4..a8221d4
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
index 0000000,0c252ae..0c252ae
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc lib/rtl/path.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index a7b6f2e,48c0d0e..48c0d0e
Binary files differ
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge