Moises Silva 2f6ccf659c Merge branch 'v1.2.stable' into v1.2.stable-em_management ...

Conflicts:
	libs/freetdm/mod_freetdm/mod_freetdm.c

2013-11-08 02:04:58 -05:00

..

clean.sh

…

CMakeLists.txt

…

Makefile.in

…

mod_freetdm.2008.vcproj

…

mod_freetdm.2010.vcxproj

…

mod_freetdm.2010.vcxproj.filters

…

mod_freetdm.c

Merge branch 'v1.2.stable' into v1.2.stable-em_management

2013-11-08 02:04:58 -05:00

mod_openzap.2005.vcproj

…

tdm.c

…