Merge pull request #34 from STIXProject/version1.2.1

updated copyright and TM info
STIXProject · Oct 7, 2015 · 2a957f6 · 2a957f6
2 parents 3b5c4f3 + f6fdcd3
commit 2a957f6
Show file tree

Hide file tree

Showing 15 changed files with 0 additions and 0 deletions.
diff --git a/documents/DRAFTv1-stix-v1.2.1-wd01-part1-overview.docx b/documents/DRAFTv1-stix-v1.2.1-wd01-part1-overview.docx
diff --git a/documents/DRAFTv1-stix-v1.2.1-wd01-part10-exploit-target.docx b/documents/DRAFTv1-stix-v1.2.1-wd01-part10-exploit-target.docx
diff --git a/documents/DRAFTv1-stix-v1.2.1-wd01-part11-report.docx b/documents/DRAFTv1-stix-v1.2.1-wd01-part11-report.docx
diff --git a/documents/DRAFTv1-stix-v1.2.1-wd01-part12-default-extensions.docx b/documents/DRAFTv1-stix-v1.2.1-wd01-part12-default-extensions.docx
diff --git a/documents/DRAFTv1-stix-v1.2.1-wd01-part13-data-marking.docx b/documents/DRAFTv1-stix-v1.2.1-wd01-part13-data-marking.docx
diff --git a/documents/DRAFTv1-stix-v1.2.1-wd01-part14-vocabularies.docx b/documents/DRAFTv1-stix-v1.2.1-wd01-part14-vocabularies.docx
diff --git a/documents/DRAFTv1-stix-v1.2.1-wd01-part15-uml-model.docx b/documents/DRAFTv1-stix-v1.2.1-wd01-part15-uml-model.docx
diff --git a/documents/DRAFTv1-stix-v1.2.1-wd01-part2-common.docx b/documents/DRAFTv1-stix-v1.2.1-wd01-part2-common.docx
diff --git a/documents/DRAFTv1-stix-v1.2.1-wd01-part3-core.docx b/documents/DRAFTv1-stix-v1.2.1-wd01-part3-core.docx
diff --git a/documents/DRAFTv1-stix-v1.2.1-wd01-part4-indicator.docx b/documents/DRAFTv1-stix-v1.2.1-wd01-part4-indicator.docx
diff --git a/documents/DRAFTv1-stix-v1.2.1-wd01-part5-ttp.docx b/documents/DRAFTv1-stix-v1.2.1-wd01-part5-ttp.docx
diff --git a/documents/DRAFTv1-stix-v1.2.1-wd01-part6-incident.docx b/documents/DRAFTv1-stix-v1.2.1-wd01-part6-incident.docx
diff --git a/documents/DRAFTv1-stix-v1.2.1-wd01-part7-threat-actor.docx b/documents/DRAFTv1-stix-v1.2.1-wd01-part7-threat-actor.docx
diff --git a/documents/DRAFTv1-stix-v1.2.1-wd01-part8-campaign.docx b/documents/DRAFTv1-stix-v1.2.1-wd01-part8-campaign.docx
diff --git a/documents/DRAFTv1-stix-v1.2.1-wd01-part9-coa.docx b/documents/DRAFTv1-stix-v1.2.1-wd01-part9-coa.docx