Revisión | d812bcddc18662dac23bef34858d8d11c9c38bcb (tree) |
---|---|
Tiempo | 2014-03-10 00:23:17 |
Autor | ttwilb <ttwilb@user...> |
Commiter | ttwilb |
removed .gitxxx files from index
@@ -1,63 +0,0 @@ | ||
1 | -############################################################################### | |
2 | -# Set default behavior to automatically normalize line endings. | |
3 | -############################################################################### | |
4 | -* text=auto | |
5 | - | |
6 | -############################################################################### | |
7 | -# Set default behavior for command prompt diff. | |
8 | -# | |
9 | -# This is need for earlier builds of msysgit that does not have it on by | |
10 | -# default for csharp files. | |
11 | -# Note: This is only used by command line | |
12 | -############################################################################### | |
13 | -#*.cs diff=csharp | |
14 | - | |
15 | -############################################################################### | |
16 | -# Set the merge driver for project and solution files | |
17 | -# | |
18 | -# Merging from the command prompt will add diff markers to the files if there | |
19 | -# are conflicts (Merging from VS is not affected by the settings below, in VS | |
20 | -# the diff markers are never inserted). Diff markers may cause the following | |
21 | -# file extensions to fail to load in VS. An alternative would be to treat | |
22 | -# these files as binary and thus will always conflict and require user | |
23 | -# intervention with every merge. To do so, just uncomment the entries below | |
24 | -############################################################################### | |
25 | -#*.sln merge=binary | |
26 | -#*.csproj merge=binary | |
27 | -#*.vbproj merge=binary | |
28 | -#*.vcxproj merge=binary | |
29 | -#*.vcproj merge=binary | |
30 | -#*.dbproj merge=binary | |
31 | -#*.fsproj merge=binary | |
32 | -#*.lsproj merge=binary | |
33 | -#*.wixproj merge=binary | |
34 | -#*.modelproj merge=binary | |
35 | -#*.sqlproj merge=binary | |
36 | -#*.wwaproj merge=binary | |
37 | - | |
38 | -############################################################################### | |
39 | -# behavior for image files | |
40 | -# | |
41 | -# image files are treated as binary by default. | |
42 | -############################################################################### | |
43 | -#*.jpg binary | |
44 | -#*.png binary | |
45 | -#*.gif binary | |
46 | - | |
47 | -############################################################################### | |
48 | -# diff behavior for common document formats | |
49 | -# | |
50 | -# Convert binary document formats to text before diffing them. This feature | |
51 | -# is only available from the command line. Turn it on by uncommenting the | |
52 | -# entries below. | |
53 | -############################################################################### | |
54 | -#*.doc diff=astextplain | |
55 | -#*.DOC diff=astextplain | |
56 | -#*.docx diff=astextplain | |
57 | -#*.DOCX diff=astextplain | |
58 | -#*.dot diff=astextplain | |
59 | -#*.DOT diff=astextplain | |
60 | -#*.pdf diff=astextplain | |
61 | -#*.PDF diff=astextplain | |
62 | -#*.rtf diff=astextplain | |
63 | -#*.RTF diff=astextplain |
@@ -1,159 +0,0 @@ | ||
1 | -## Ignore Visual Studio temporary files, build results, and | |
2 | -## files generated by popular Visual Studio add-ons. | |
3 | - | |
4 | -# User-specific files | |
5 | -*.suo | |
6 | -*.user | |
7 | -*.sln.docstates | |
8 | - | |
9 | -# Build results | |
10 | - | |
11 | -[Dd]ebug/ | |
12 | -[Rr]elease/ | |
13 | -x64/ | |
14 | -build/ | |
15 | -[Bb]in/ | |
16 | -[Oo]bj/ | |
17 | - | |
18 | -# Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets | |
19 | -!packages/*/build/ | |
20 | - | |
21 | -# MSTest test Results | |
22 | -[Tt]est[Rr]esult*/ | |
23 | -[Bb]uild[Ll]og.* | |
24 | - | |
25 | -*_i.c | |
26 | -*_p.c | |
27 | -*.ilk | |
28 | -*.meta | |
29 | -*.obj | |
30 | -*.pch | |
31 | -*.pdb | |
32 | -*.pgc | |
33 | -*.pgd | |
34 | -*.rsp | |
35 | -*.sbr | |
36 | -*.tlb | |
37 | -*.tli | |
38 | -*.tlh | |
39 | -*.tmp | |
40 | -*.tmp_proj | |
41 | -*.log | |
42 | -*.vspscc | |
43 | -*.vssscc | |
44 | -.builds | |
45 | -*.pidb | |
46 | -*.log | |
47 | -*.scc | |
48 | - | |
49 | -# Visual C++ cache files | |
50 | -ipch/ | |
51 | -*.aps | |
52 | -*.ncb | |
53 | -*.opensdf | |
54 | -*.sdf | |
55 | -*.cachefile | |
56 | - | |
57 | -# Visual Studio profiler | |
58 | -*.psess | |
59 | -*.vsp | |
60 | -*.vspx | |
61 | - | |
62 | -# Guidance Automation Toolkit | |
63 | -*.gpState | |
64 | - | |
65 | -# ReSharper is a .NET coding add-in | |
66 | -_ReSharper*/ | |
67 | -*.[Rr]e[Ss]harper | |
68 | - | |
69 | -# TeamCity is a build add-in | |
70 | -_TeamCity* | |
71 | - | |
72 | -# DotCover is a Code Coverage Tool | |
73 | -*.dotCover | |
74 | - | |
75 | -# NCrunch | |
76 | -*.ncrunch* | |
77 | -.*crunch*.local.xml | |
78 | - | |
79 | -# Installshield output folder | |
80 | -[Ee]xpress/ | |
81 | - | |
82 | -# DocProject is a documentation generator add-in | |
83 | -DocProject/buildhelp/ | |
84 | -DocProject/Help/*.HxT | |
85 | -DocProject/Help/*.HxC | |
86 | -DocProject/Help/*.hhc | |
87 | -DocProject/Help/*.hhk | |
88 | -DocProject/Help/*.hhp | |
89 | -DocProject/Help/Html2 | |
90 | -DocProject/Help/html | |
91 | - | |
92 | -# Click-Once directory | |
93 | -publish/ | |
94 | - | |
95 | -# Publish Web Output | |
96 | -*.Publish.xml | |
97 | - | |
98 | -# NuGet Packages Directory | |
99 | -## TODO: If you have NuGet Package Restore enabled, uncomment the next line | |
100 | -#packages/ | |
101 | - | |
102 | -# Windows Azure Build Output | |
103 | -csx | |
104 | -*.build.csdef | |
105 | - | |
106 | -# Windows Store app package directory | |
107 | -AppPackages/ | |
108 | - | |
109 | -# Others | |
110 | -sql/ | |
111 | -*.Cache | |
112 | -ClientBin/ | |
113 | -[Ss]tyle[Cc]op.* | |
114 | -~$* | |
115 | -*~ | |
116 | -*.dbmdl | |
117 | -*.[Pp]ublish.xml | |
118 | -*.pfx | |
119 | -*.publishsettings | |
120 | - | |
121 | -# RIA/Silverlight projects | |
122 | -Generated_Code/ | |
123 | - | |
124 | -# Backup & report files from converting an old project file to a newer | |
125 | -# Visual Studio version. Backup files are not needed, because we have git ;-) | |
126 | -_UpgradeReport_Files/ | |
127 | -Backup*/ | |
128 | -UpgradeLog*.XML | |
129 | -UpgradeLog*.htm | |
130 | - | |
131 | -# SQL Server files | |
132 | -App_Data/*.mdf | |
133 | -App_Data/*.ldf | |
134 | - | |
135 | - | |
136 | -#LightSwitch generated files | |
137 | -GeneratedArtifacts/ | |
138 | -_Pvt_Extensions/ | |
139 | -ModelManifest.xml | |
140 | - | |
141 | -# ========================= | |
142 | -# Windows detritus | |
143 | -# ========================= | |
144 | - | |
145 | -# Windows image file caches | |
146 | -Thumbs.db | |
147 | -ehthumbs.db | |
148 | - | |
149 | -# Folder config file | |
150 | -Desktop.ini | |
151 | - | |
152 | -# Recycle Bin used on file shares | |
153 | -$RECYCLE.BIN/ | |
154 | - | |
155 | -# Mac desktop service store files | |
156 | -.DS_Store | |
157 | -/HeavyOSECPU.vcxproj | |
158 | -/HeavyOSECPU.sln | |
159 | -/HeavyOSECPU.vcxproj.filters |