[CMAKE]
authorAmine Khaldi <amine.khaldi@reactos.org>
Wed, 15 Jun 2011 19:36:15 +0000 (19:36 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Wed, 15 Jun 2011 19:36:15 +0000 (19:36 +0000)
commit47b2fb3e686d41108fa44d9948cecf6b463940a5
treea5d4380c5e91a9b721aaf1dbea57585a0d5bd963
parentddab848f06d77cf7027a3d597a35942e35a760c9
[CMAKE]
* Merge 50707, 50713, 50742, 50779, 50795 and 50796 from the cmake branch.
* Merge state.c change from 50740.

svn path=/trunk/; revision=52255
12 files changed:
reactos/dll/directx/wine/wined3d/state.c
reactos/dll/win32/batt/resource.h
reactos/dll/win32/winmm/registry.c
reactos/drivers/bus/acpi/busmgr/button.c
reactos/drivers/bus/acpi/busmgr/power.c
reactos/drivers/bus/acpi/busmgr/system.c
reactos/drivers/bus/acpi/main.c
reactos/drivers/bus/acpi/pnp.c
reactos/drivers/bus/acpi/power.c
reactos/drivers/bus/pcix/pci/busno.c
reactos/lib/3rdparty/libsamplerate/CMakeLists.txt
reactos/lib/3rdparty/libsamplerate/src_linear.c