Sync with trunk r63343.
authorDavid Quintana <gigaherz@gmail.com>
Sun, 18 May 2014 12:11:58 +0000 (12:11 +0000)
committerDavid Quintana <gigaherz@gmail.com>
Sun, 18 May 2014 12:11:58 +0000 (12:11 +0000)
svn path=/branches/shell-experiments/; revision=63351

358 files changed:
1  2 
CMakeLists.txt
base/applications/cmdutils/doskey/lang/de-DE.rc
base/applications/cmdutils/find/lang/de-DE.rc
base/applications/cmdutils/help/lang/de-DE.rc
base/applications/cmdutils/hostname/lang/de-DE.rc
base/applications/cmdutils/reg/lang/de-DE.rc
base/applications/cmdutils/taskkill/lang/de-DE.rc
base/applications/logoff/lang/de-DE.rc
base/applications/magnify/lang/de-DE.rc
base/applications/msconfig/lang/de-DE.rc
base/applications/mscutils/devmgmt/lang/de-DE.rc
base/applications/mscutils/servman/lang/de-DE.rc
base/applications/mstsc/lang/de-DE.rc
base/applications/network/ipconfig/lang/de-DE.rc
base/applications/network/ping/lang/de-DE.rc
base/applications/notepad/lang/de-DE.rc
base/applications/rapps/rapps/7zip.txt
base/applications/rapps/rapps/abiword.txt
base/applications/rapps/rapps/abiword26.txt
base/applications/rapps/rapps/abyss.txt
base/applications/rapps/rapps/ac97forvirtualbox.txt
base/applications/rapps/rapps/alreader.txt
base/applications/rapps/rapps/ants.txt
base/applications/rapps/rapps/audiograbber.txt
base/applications/rapps/rapps/bittorrent.txt
base/applications/rapps/rapps/bochs.txt
base/applications/rapps/rapps/boswars.txt
base/applications/rapps/rapps/boundaround.txt
base/applications/rapps/rapps/christmasbound.txt
base/applications/rapps/rapps/chromium.txt
base/applications/rapps/rapps/cnt.txt
base/applications/rapps/rapps/codeblocks.txt
base/applications/rapps/rapps/codeblocks_gcc.txt
base/applications/rapps/rapps/codeblocks_gcc_2.txt
base/applications/rapps/rapps/comctl32ocx.txt
base/applications/rapps/rapps/devcpp_mingw32.txt
base/applications/rapps/rapps/devcpp_tdm_gcc_x64.txt
base/applications/rapps/rapps/diablo2.txt
base/applications/rapps/rapps/dosblaster.txt
base/applications/rapps/rapps/dosbox.txt
base/applications/rapps/rapps/doublecommander.txt
base/applications/rapps/rapps/dplus.txt
base/applications/rapps/rapps/dvdwritenow.txt
base/applications/rapps/rapps/excelview.txt
base/applications/rapps/rapps/fap.txt
base/applications/rapps/rapps/fira.txt
base/applications/rapps/rapps/firefox.txt
base/applications/rapps/rapps/firefox2.txt
base/applications/rapps/rapps/firefox3.txt
base/applications/rapps/rapps/firefox36.txt
base/applications/rapps/rapps/freebasic.txt
base/applications/rapps/rapps/glidewrapzbag.txt
base/applications/rapps/rapps/globulation2.txt
base/applications/rapps/rapps/hover.txt
base/applications/rapps/rapps/hxd.txt
base/applications/rapps/rapps/indiftpd.txt
base/applications/rapps/rapps/irfanview.txt
base/applications/rapps/rapps/irfanviewplugins.txt
base/applications/rapps/rapps/kdewin.txt
base/applications/rapps/rapps/kyodai.txt
base/applications/rapps/rapps/lazaruside.txt
base/applications/rapps/rapps/lbreakout2.txt
base/applications/rapps/rapps/lgeneral.txt
base/applications/rapps/rapps/libreoffice.txt
base/applications/rapps/rapps/lmarbles.txt
base/applications/rapps/rapps/mcwin32.txt
base/applications/rapps/rapps/mfc40.txt
base/applications/rapps/rapps/mirandaim.txt
base/applications/rapps/rapps/mirc.txt
base/applications/rapps/rapps/mirc6.txt
base/applications/rapps/rapps/mono2.txt
base/applications/rapps/rapps/mpc.txt
base/applications/rapps/rapps/mpxplay.txt
base/applications/rapps/rapps/msxml3.txt
base/applications/rapps/rapps/net11.txt
base/applications/rapps/rapps/net20.txt
base/applications/rapps/rapps/net20sp2.txt
base/applications/rapps/rapps/npp.txt
base/applications/rapps/rapps/offbyone.txt
base/applications/rapps/rapps/opencodecs.txt
base/applications/rapps/rapps/openoffice.txt
base/applications/rapps/rapps/openoffice2.4.txt
base/applications/rapps/rapps/openttd.txt
base/applications/rapps/rapps/opera.txt
base/applications/rapps/rapps/opera9.txt
base/applications/rapps/rapps/peazip.txt
base/applications/rapps/rapps/pengupop.txt
base/applications/rapps/rapps/photofiltre.txt
base/applications/rapps/rapps/pingus.txt
base/applications/rapps/rapps/pptview.txt
base/applications/rapps/rapps/pspad.txt
base/applications/rapps/rapps/ptanks.txt
base/applications/rapps/rapps/putty.txt
base/applications/rapps/rapps/python.txt
base/applications/rapps/rapps/python2.txt
base/applications/rapps/rapps/qb64sdl.txt
base/applications/rapps/rapps/qmmp.txt
base/applications/rapps/rapps/remood.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/rapps/rapps/sambatng.txt
base/applications/rapps/rapps/sbforvmware.txt
base/applications/rapps/rapps/scite.txt
base/applications/rapps/rapps/scummvm.txt
base/applications/rapps/rapps/sdl_mixer.txt
base/applications/rapps/rapps/sdl_runtime.txt
base/applications/rapps/rapps/seamonkey.txt
base/applications/rapps/rapps/smplayer.txt
base/applications/rapps/rapps/snoopy.txt
base/applications/rapps/rapps/stamina.txt
base/applications/rapps/rapps/steam.txt
base/applications/rapps/rapps/sumatrapdf.txt
base/applications/rapps/rapps/summerbound.txt
base/applications/rapps/rapps/superdxb.txt
base/applications/rapps/rapps/superfinder.txt
base/applications/rapps/rapps/supertux.txt
base/applications/rapps/rapps/tahoma.txt
base/applications/rapps/rapps/thunderbird.txt
base/applications/rapps/rapps/thunderbird3.txt
base/applications/rapps/rapps/tileworld.txt
base/applications/rapps/rapps/totalcommander.txt
base/applications/rapps/rapps/tuxpaint.txt
base/applications/rapps/rapps/ultravnc.txt
base/applications/rapps/rapps/utorrent.txt
base/applications/rapps/rapps/vb5run.txt
base/applications/rapps/rapps/vb6run.txt
base/applications/rapps/rapps/vc2005sp1run.txt
base/applications/rapps/rapps/vc2008sp1run.txt
base/applications/rapps/rapps/vc2010run.txt
base/applications/rapps/rapps/vc6run.txt
base/applications/rapps/rapps/vlc.txt
base/applications/rapps/rapps/winboard.txt
base/applications/rapps/rapps/wme9.txt
base/applications/rapps/rapps/wordview.txt
base/applications/rapps/rapps/zaz.txt
base/applications/regedit/lang/de-DE.rc
base/applications/wordpad/lang/De.rc
base/setup/usetup/interface/consup.c
base/setup/usetup/lang/de-DE.h
base/setup/usetup/native/console.c
base/setup/usetup/native/fslist.c
base/setup/usetup/native/utils/console.c
base/setup/usetup/native/utils/console.h
dll/3rdparty/libjpeg/README
dll/3rdparty/libjpeg/change.log
dll/3rdparty/libjpeg/cjpeg.c
dll/3rdparty/libjpeg/jcapistd.c
dll/3rdparty/libjpeg/jcarith.c
dll/3rdparty/libjpeg/jccolor.c
dll/3rdparty/libjpeg/jcdctmgr.c
dll/3rdparty/libjpeg/jchuff.c
dll/3rdparty/libjpeg/jcinit.c
dll/3rdparty/libjpeg/jcmarker.c
dll/3rdparty/libjpeg/jcmaster.c
dll/3rdparty/libjpeg/jcparam.c
dll/3rdparty/libjpeg/jctrans.c
dll/3rdparty/libjpeg/jdapimin.c
dll/3rdparty/libjpeg/jdapistd.c
dll/3rdparty/libjpeg/jdarith.c
dll/3rdparty/libjpeg/jdcolor.c
dll/3rdparty/libjpeg/jddctmgr.c
dll/3rdparty/libjpeg/jdhuff.c
dll/3rdparty/libjpeg/jdinput.c
dll/3rdparty/libjpeg/jdmarker.c
dll/3rdparty/libjpeg/jdmaster.c
dll/3rdparty/libjpeg/jdmerge.c
dll/3rdparty/libjpeg/jfdctint.c
dll/3rdparty/libjpeg/jidctint.c
dll/3rdparty/libjpeg/jpegtran.c
dll/3rdparty/libjpeg/transupp.c
dll/cpl/access/lang/de-DE.rc
dll/cpl/desk/lang/de-DE.rc
dll/cpl/hdwwiz/lang/de-DE.rc
dll/cpl/inetcpl/lang/de-DE.rc
dll/cpl/input/lang/de-DE.rc
dll/cpl/intl/lang/de-DE.rc
dll/cpl/mmsys/lang/de-DE.rc
dll/cpl/sysdm/lang/de-DE.rc
dll/cpl/timedate/lang/de-DE.rc
dll/cpl/usrmgr/lang/de-DE.rc
dll/cpl/usrmgr/lang/en-US.rc
dll/cpl/usrmgr/lang/fr-FR.rc
dll/cpl/usrmgr/lang/he-IL.rc
dll/cpl/usrmgr/lang/ru-RU.rc
dll/cpl/usrmgr/lang/uk-UA.rc
dll/opengl/opengl32/wgl_font.c
dll/shellext/deskadp/lang/de-DE.rc
dll/shellext/slayer/lang/de-DE.rc
dll/win32/CMakeLists.txt
dll/win32/aclui/lang/de-DE.rc
dll/win32/comctl32/lang/comctl_De.rc
dll/win32/comdlg32/lang/cdlg_De.rc
dll/win32/cryptui/lang/cryptui_De.rc
dll/win32/devmgr/lang/de-DE.rc
dll/win32/iccvid/lang/iccvid_De.rc
dll/win32/jscript/lang/jscript_De.rc
dll/win32/kernel32/client/vdm.c
dll/win32/localspl/lang/spl_De.rc
dll/win32/localui/lang/ui_De.rc
dll/win32/lsasrv/lang/de-DE.rc
dll/win32/mapi32/lang/De.rc
dll/win32/msgina/lang/de-DE.rc
dll/win32/mshtml/lang/De.rc
dll/win32/msports/lang/de-DE.rc
dll/win32/msvfw32/lang/msvfw32_De.rc
dll/win32/netcfgx/lang/de-DE.rc
dll/win32/netid/lang/de-DE.rc
dll/win32/netshell/lang/de-DE.rc
dll/win32/oleacc/lang/oleacc_De.rc
dll/win32/oledlg/lang/oledlg_De.rc
dll/win32/samsrv/lang/de-DE.rc
dll/win32/serialui/lang/de-DE.rc
dll/win32/shell32/lang/de-DE.rc
dll/win32/syssetup/lang/de-DE.rc
dll/win32/winmm/lang/winmm_De.rc
dll/win32/winscard/CMakeLists.txt
dll/win32/winscard/precomp.h
dll/win32/winscard/stubs.c
dll/win32/winscard/winscard.c
dll/win32/winscard/winscard.spec
include/psdk/winscard.h
include/reactos/libs/fast486/fast486.h
include/reactos/libs/libjpeg/jconfig.h
include/reactos/libs/libjpeg/jmorecfg.h
include/reactos/libs/libjpeg/jpegint.h
include/reactos/libs/libjpeg/jpeglib.h
include/reactos/libs/libjpeg/jversion.h
include/reactos/libs/libjpeg/transupp.h
lib/3rdparty/freetype/ChangeLog
lib/3rdparty/freetype/README
lib/3rdparty/freetype/devel/ftoption.h
lib/3rdparty/freetype/include/config/ftconfig.h
lib/3rdparty/freetype/include/config/ftoption.h
lib/3rdparty/freetype/include/freetype.h
lib/3rdparty/freetype/include/ftautoh.h
lib/3rdparty/freetype/include/ftbdf.h
lib/3rdparty/freetype/include/ftchapters.h
lib/3rdparty/freetype/include/ftoutln.h
lib/3rdparty/freetype/include/internal/ftrfork.h
lib/3rdparty/freetype/include/internal/fttrace.h
lib/3rdparty/freetype/src/autofit/afblue.c
lib/3rdparty/freetype/src/autofit/afblue.cin
lib/3rdparty/freetype/src/autofit/afblue.h
lib/3rdparty/freetype/src/autofit/afblue.hin
lib/3rdparty/freetype/src/autofit/afcjk.c
lib/3rdparty/freetype/src/autofit/afcjk.h
lib/3rdparty/freetype/src/autofit/afcover.h
lib/3rdparty/freetype/src/autofit/afdummy.c
lib/3rdparty/freetype/src/autofit/afdummy.h
lib/3rdparty/freetype/src/autofit/afglobal.c
lib/3rdparty/freetype/src/autofit/afglobal.h
lib/3rdparty/freetype/src/autofit/afhints.c
lib/3rdparty/freetype/src/autofit/afhints.h
lib/3rdparty/freetype/src/autofit/afindic.c
lib/3rdparty/freetype/src/autofit/afindic.h
lib/3rdparty/freetype/src/autofit/aflatin.c
lib/3rdparty/freetype/src/autofit/aflatin.h
lib/3rdparty/freetype/src/autofit/aflatin2.c
lib/3rdparty/freetype/src/autofit/aflatin2.h
lib/3rdparty/freetype/src/autofit/afloader.c
lib/3rdparty/freetype/src/autofit/afloader.h
lib/3rdparty/freetype/src/autofit/afmodule.c
lib/3rdparty/freetype/src/autofit/afmodule.h
lib/3rdparty/freetype/src/autofit/afpic.c
lib/3rdparty/freetype/src/autofit/afpic.h
lib/3rdparty/freetype/src/autofit/afranges.c
lib/3rdparty/freetype/src/autofit/afranges.h
lib/3rdparty/freetype/src/autofit/afscript.h
lib/3rdparty/freetype/src/autofit/afstyles.h
lib/3rdparty/freetype/src/autofit/aftypes.h
lib/3rdparty/freetype/src/autofit/afwrtsys.h
lib/3rdparty/freetype/src/autofit/autofit.c
lib/3rdparty/freetype/src/autofit/hbshim.c
lib/3rdparty/freetype/src/autofit/hbshim.h
lib/3rdparty/freetype/src/base/basepic.c
lib/3rdparty/freetype/src/base/ftbitmap.c
lib/3rdparty/freetype/src/base/ftcalc.c
lib/3rdparty/freetype/src/base/ftobjs.c
lib/3rdparty/freetype/src/base/ftoutln.c
lib/3rdparty/freetype/src/base/ftrfork.c
lib/3rdparty/freetype/src/bdf/bdfdrivr.c
lib/3rdparty/freetype/src/bdf/bdflib.c
lib/3rdparty/freetype/src/cff/cf2blues.c
lib/3rdparty/freetype/src/cff/cf2font.c
lib/3rdparty/freetype/src/cff/cf2ft.c
lib/3rdparty/freetype/src/cff/cf2hints.c
lib/3rdparty/freetype/src/cff/cffload.c
lib/3rdparty/freetype/src/cff/cffobjs.c
lib/3rdparty/freetype/src/cff/cffparse.c
lib/3rdparty/freetype/src/cid/cidload.c
lib/3rdparty/freetype/src/cid/cidobjs.c
lib/3rdparty/freetype/src/cid/cidparse.c
lib/3rdparty/freetype/src/cid/cidparse.h
lib/3rdparty/freetype/src/pcf/pcfread.c
lib/3rdparty/freetype/src/pfr/pfrload.c
lib/3rdparty/freetype/src/pfr/pfrobjs.c
lib/3rdparty/freetype/src/psaux/psobjs.c
lib/3rdparty/freetype/src/pshinter/pshalgo.c
lib/3rdparty/freetype/src/raster/ftraster.c
lib/3rdparty/freetype/src/sfnt/sfdriver.c
lib/3rdparty/freetype/src/sfnt/ttcmap.c
lib/3rdparty/freetype/src/sfnt/ttsbit.c
lib/3rdparty/freetype/src/smooth/ftgrays.c
lib/3rdparty/freetype/src/tools/afblue.pl
lib/3rdparty/freetype/src/truetype/ttgload.c
lib/3rdparty/freetype/src/truetype/ttinterp.c
lib/3rdparty/freetype/src/truetype/ttinterp.h
lib/3rdparty/freetype/src/type1/t1gload.c
lib/3rdparty/freetype/src/type1/t1load.c
lib/3rdparty/freetype/src/type1/t1objs.c
lib/3rdparty/freetype/src/type1/t1parse.c
lib/3rdparty/freetype/src/type42/t42objs.c
lib/3rdparty/freetype/src/type42/t42parse.c
lib/3rdparty/freetype/src/winfonts/winfnt.c
lib/fast486/fast486.c
lib/fast486/opcodes.c
lib/sdk/crt/stdio/file.c
media/doc/3rd Party Files.txt
media/doc/README.WINE
media/fonts/tahoma.ttf
media/fonts/tahomabd.ttf
ntoskrnl/ex/mutant.c
ntoskrnl/fstub/disksup.c
ntoskrnl/mm/ARM3/miarm.h
ntoskrnl/mm/ARM3/procsup.c
ntoskrnl/mm/ARM3/section.c
ntoskrnl/mm/ARM3/vadnode.c
ntoskrnl/mm/ARM3/virtual.c
subsystems/ntvdm/bios/bios32/kbdbios32.c
subsystems/ntvdm/bios/vidbios.c
subsystems/ntvdm/callback.c
subsystems/ntvdm/dos/dos32krnl/bios.c
subsystems/ntvdm/dos/dos32krnl/dos.c
subsystems/ntvdm/dos/dos32krnl/dos.h
subsystems/ntvdm/dos/dos32krnl/dosfiles.c
subsystems/ntvdm/emulator.c
subsystems/ntvdm/emulator.h
subsystems/ntvdm/hardware/cmos.c
subsystems/ntvdm/lang/cs-CZ.rc
subsystems/ntvdm/lang/de-DE.rc
subsystems/ntvdm/lang/en-US.rc
subsystems/ntvdm/lang/es-ES.rc
subsystems/ntvdm/lang/fr-FR.rc
subsystems/ntvdm/lang/it-IT.rc
subsystems/ntvdm/lang/pl-PL.rc
subsystems/ntvdm/ntvdm.c
subsystems/ntvdm/resource.h
subsystems/win/basesrv/vdm.c
win32ss/drivers/miniport/vga_new/vbemodes.c
win32ss/gdi/ntgdi/bitmaps.c
win32ss/user/ntuser/menu.c
win32ss/user/ntuser/menu.h
win32ss/user/user32/misc/dllmain.c
win32ss/user/winsrv/consrv/frontends/gui/conwnd.c
win32ss/user/winsrv/consrv/frontends/gui/guiterm.c

diff --cc CMakeLists.txt
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
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
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,c7b54e3..c7b54e3
mode 000000,100644..100644
--- /dev/null
Simple merge
index 0000000,25253ff..25253ff
mode 000000,100644..100644
--- /dev/null
Simple merge
index 0000000,a20d780..a20d780
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
index d597694,4f68d1e..4f68d1e
Binary files differ
index 007f9ad,c01f9e1..c01f9e1
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
Simple merge
Simple merge
Simple merge
Simple merge