summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Mitz <mitza-oci@users.noreply.github.com>2011-04-08 14:38:46 +0000
committerAdam Mitz <mitza-oci@users.noreply.github.com>2011-04-08 14:38:46 +0000
commit159ecf0d64ee758bf6256b917085e99e50b7ad47 (patch)
tree7302c71d6be875f01412739acc518ca0e13a9644
parent55033536ba4934a5b38d0c06f4db84af6205de11 (diff)
downloadMPC-159ecf0d64ee758bf6256b917085e99e50b7ad47.tar.gz
ChangeLogTag: Fri Apr 8 14:35:18 UTC 2011 Adam Mitz <mitza@ociweb.com>
-rw-r--r--ChangeLog6
-rw-r--r--templates/vc8csharp.mpd4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c3ea0972..1b7d1244 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Apr 8 14:35:18 UTC 2011 Adam Mitz <mitza@ociweb.com>
+
+ * templates/vc8csharp.mpd:
+
+ Added "UserControl" as a valid subtype setting for C#.
+
Wed Apr 6 12:02:50 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
* config/coredx_ts_defaults.mpb:
diff --git a/templates/vc8csharp.mpd b/templates/vc8csharp.mpd
index 5acd4346..c7978ab0 100644
--- a/templates/vc8csharp.mpd
+++ b/templates/vc8csharp.mpd
@@ -131,7 +131,7 @@
</ItemGroup>
<ItemGroup>
<%foreach(source_files)%>
-<%if(contains(flag_overrides(source_file, subtype), ^(Form|Component)$))%>
+<%if(contains(flag_overrides(source_file, subtype), ^(Form|Component|UserControl)$))%>
<Compile Include="<%source_file%>">
<SubType><%flag_overrides(source_file, subtype)%></SubType>
<%if(flag_overrides(source_file, dependent_upon))%>
@@ -158,7 +158,7 @@
<%endif%>
<%endfor%>
<%foreach(source_files)%>
-<%if(!contains(flag_overrides(source_file, subtype), ^(Form|Component)$))%>
+<%if(!contains(flag_overrides(source_file, subtype), ^(Form|Component|UserControl)$))%>
<%if(!compares(vcversion, 8.00) && ends_with(source_file, \.manifest))%>
<None Include="<%source_file%>" />
<%else%>