aboutsummaryrefslogtreecommitdiff
path: root/vsprojects
diff options
context:
space:
mode:
authorxiaofeng@google.com <xiaofeng@google.com@630680e5-0e50-0410-840e-4b1c322b438d>2012-12-04 18:44:24 +0000
committerxiaofeng@google.com <xiaofeng@google.com@630680e5-0e50-0410-840e-4b1c322b438d>2012-12-04 18:44:24 +0000
commitcaa66db018a89a64b3912bcee0c4e1653ce5875e (patch)
tree353f7ecbb649752247ffe4f06ecca4d3a7b366fa /vsprojects
parenteaaef0b39b6710574db25a264cc4980e40f678ea (diff)
downloadprotobuf-caa66db018a89a64b3912bcee0c4e1653ce5875e.tar.gz
protobuf-caa66db018a89a64b3912bcee0c4e1653ce5875e.tar.bz2
protobuf-caa66db018a89a64b3912bcee0c4e1653ce5875e.zip
Merge from tags/2.5.0rc1 to trunk
Diffstat (limited to 'vsprojects')
-rwxr-xr-xvsprojects/extract_includes.bat2
1 files changed, 2 insertions, 0 deletions
diff --git a/vsprojects/extract_includes.bat b/vsprojects/extract_includes.bat
index f4852554..2ddcddbe 100755
--- a/vsprojects/extract_includes.bat
+++ b/vsprojects/extract_includes.bat
@@ -12,6 +12,8 @@ copy ..\src\google\protobuf\stubs\atomicops_internals_x86_msvc.h include\google\
copy ..\src\google\protobuf\stubs\common.h include\google\protobuf\stubs\common.h
copy ..\src\google\protobuf\stubs\once.h include\google\protobuf\stubs\once.h
copy ..\src\google\protobuf\stubs\platform_macros.h include\google\protobuf\stubs\platform_macros.h
+copy ..\src\google\protobuf\stubs\template_util.h include\google\protobuf\stubs\template_util.h
+copy ..\src\google\protobuf\stubs\type_traits.h include\google\protobuf\stubs\type_traits.h
copy ..\src\google\protobuf\descriptor.h include\google\protobuf\descriptor.h
copy ..\src\google\protobuf\descriptor.pb.h include\google\protobuf\descriptor.pb.h
copy ..\src\google\protobuf\descriptor_database.h include\google\protobuf\descriptor_database.h