* Sync up to trunk head (r65426).
authorAmine Khaldi <amine.khaldi@reactos.org>
Mon, 17 Nov 2014 15:16:41 +0000 (15:16 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Mon, 17 Nov 2014 15:16:41 +0000 (15:16 +0000)
svn path=/branches/shell-experiments/; revision=65427

81 files changed:
1  2 
base/applications/network/net/cmdLocalGroup.c
base/applications/network/net/cmdUser.c
base/applications/network/net/main.c
base/applications/network/net/net.h
base/applications/rapps/README.ENG
base/applications/rapps/README.RUS
base/applications/rapps/rapps/dvdwritenow.txt
base/applications/rapps/rapps/excelview.txt
base/applications/rapps/rapps/foxit.txt
base/applications/rapps/rapps/ghostscript.txt
base/applications/rapps/rapps/ghostview.txt
base/applications/rapps/rapps/inkscape.txt
base/applications/rapps/rapps/librecad.txt
base/applications/rapps/rapps/libreoffice.txt
base/applications/rapps/rapps/libreofficehelp.txt
base/applications/rapps/rapps/miktex.txt
base/applications/rapps/rapps/nirlauncher.txt
base/applications/rapps/rapps/precisecalc.txt
base/applications/rapps/rapps/wordview.txt
dll/cpl/appwiz/lang/bg-BG.rc
dll/cpl/appwiz/lang/cs-CZ.rc
dll/cpl/appwiz/lang/de-DE.rc
dll/cpl/appwiz/lang/el-GR.rc
dll/cpl/appwiz/lang/en-US.rc
dll/cpl/appwiz/lang/es-ES.rc
dll/cpl/appwiz/lang/fr-FR.rc
dll/cpl/appwiz/lang/he-IL.rc
dll/cpl/appwiz/lang/it-IT.rc
dll/cpl/appwiz/lang/no-NO.rc
dll/cpl/appwiz/lang/pl-PL.rc
dll/cpl/appwiz/lang/pt-BR.rc
dll/cpl/appwiz/lang/ro-RO.rc
dll/cpl/appwiz/lang/ru-RU.rc
dll/cpl/appwiz/lang/sk-SK.rc
dll/cpl/appwiz/lang/sq-AL.rc
dll/cpl/appwiz/lang/tr-TR.rc
dll/cpl/appwiz/lang/uk-UA.rc
dll/cpl/appwiz/lang/zh-CN.rc
dll/win32/advapi32/wine/security.c
dll/win32/devmgr/hwpage.c
dll/win32/msafd/misc/dllmain.c
drivers/hid/kbdhid/kbdhid.c
drivers/hid/mouhid/mouhid.c
lib/cmlib/cmtools.c
lib/drivers/hidparser/api.c
lib/drivers/hidparser/hidparser.c
lib/drivers/hidparser/parser.c
lib/drivers/ip/network/routines.c
lib/drivers/sound/mmebuddy/mmewrap.c
lib/drivers/sound/mmixer/controls.c
lib/rtl/debug.c
lib/rtl/env.c
lib/rtl/resource.c
lib/rtl/time.c
lib/rtl/unicode.c
lib/sdk/crt/misc/lock.c
ntoskrnl/cc/pin.c
ntoskrnl/config/cmapi.c
ntoskrnl/fsrtl/fastio.c
ntoskrnl/fsrtl/largemcb.c
ntoskrnl/fsrtl/oplock.c
ntoskrnl/fsrtl/tunnel.c
ntoskrnl/fstub/disksup.c
ntoskrnl/include/internal/ke_x.h
ntoskrnl/io/iomgr/driver.c
ntoskrnl/io/iomgr/file.c
ntoskrnl/kd64/kdapi.c
ntoskrnl/ke/amd64/except.c
ntoskrnl/ke/arm/exp.c
ntoskrnl/ke/bug.c
ntoskrnl/ke/i386/exp.c
ntoskrnl/mm/ARM3/pfnlist.c
ntoskrnl/mm/ARM3/session.c
ntoskrnl/se/priv.c
ntoskrnl/se/sd.c
subsystems/ntvdm/bios/vidbios.c
subsystems/ntvdm/emulator.c
subsystems/ntvdm/emulator.h
subsystems/ntvdm/hardware/vga.c
subsystems/ntvdm/hardware/vga.h
win32ss/gdi/ntgdi/dibobj.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
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc lib/rtl/debug.c
Simple merge
diff --cc lib/rtl/env.c
Simple merge
Simple merge
diff --cc lib/rtl/time.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