Skip to content

Commit 59e2084

Browse files
wizardzhang2017wizardzhang2017
committed
Merge branch 'onlyliuxin-master'
2 parents 1722a02 + 16e186e commit 59e2084

File tree

529 files changed

+29181
-2991
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

529 files changed

+29181
-2991
lines changed

‎.gitignore

Lines changed: 266 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,267 @@
1+
#################
2+
## Eclipse
3+
#################
14

5+
*.pydevproject
6+
.project
7+
.metadata
8+
bin/
9+
tmp/
10+
*.tmp
11+
*.bak
12+
*.swp
13+
*~.nib
14+
local.properties
15+
.classpath
16+
.settings/
17+
.loadpath
18+
19+
# External tool builders
20+
.externalToolBuilders/
21+
22+
# Locally stored "Eclipse launch configurations"
23+
*.launch
24+
25+
# CDT-specific
26+
.cproject
27+
28+
# PDT-specific
29+
.buildpath
30+
31+
32+
#################
33+
## Visual Studio
34+
#################
35+
36+
## Ignore Visual Studio temporary files, build results, and
37+
## files generated by popular Visual Studio add-ons.
38+
39+
# User-specific files
40+
*.suo
41+
*.user
42+
*.sln.docstates
43+
44+
# Build results
45+
46+
[Dd]ebug/
47+
[Rr]elease/
48+
x64/
49+
build/
50+
[Bb]in/
51+
[Oo]bj/
52+
53+
# MSTest test Results
54+
[Tt]est[Rr]esult*/
55+
[Bb]uild[Ll]og.*
56+
57+
*_i.c
58+
*_p.c
59+
*.ilk
60+
*.meta
61+
*.obj
62+
*.pch
63+
*.pdb
64+
*.pgc
65+
*.pgd
66+
*.rsp
67+
*.sbr
68+
*.tlb
69+
*.tli
70+
*.tlh
71+
*.tmp
72+
*.tmp_proj
73+
*.log
74+
*.vspscc
75+
*.vssscc
76+
.builds
77+
*.pidb
78+
*.log
79+
*.scc
80+
81+
# Visual C++ cache files
82+
ipch/
83+
*.aps
84+
*.ncb
85+
*.opensdf
86+
*.sdf
87+
*.cachefile
88+
89+
# Visual Studio profiler
90+
*.psess
91+
*.vsp
92+
*.vspx
93+
94+
# Guidance Automation Toolkit
95+
*.gpState
96+
97+
# ReSharper is a .NET coding add-in
98+
_ReSharper*/
99+
*.[Rr]e[Ss]harper
100+
101+
# TeamCity is a build add-in
102+
_TeamCity*
103+
104+
# DotCover is a Code Coverage Tool
105+
*.dotCover
106+
107+
# NCrunch
108+
*.ncrunch*
109+
.*crunch*.local.xml
110+
111+
# Installshield output folder
112+
[Ee]xpress/
113+
114+
# DocProject is a documentation generator add-in
115+
DocProject/buildhelp/
116+
DocProject/Help/*.HxT
117+
DocProject/Help/*.HxC
118+
DocProject/Help/*.hhc
119+
DocProject/Help/*.hhk
120+
DocProject/Help/*.hhp
121+
DocProject/Help/Html2
122+
DocProject/Help/html
123+
124+
# Click-Once directory
125+
publish/
126+
127+
# Publish Web Output
128+
*.Publish.xml
129+
*.pubxml
130+
*.publishproj
131+
132+
# NuGet Packages Directory
133+
## TODO: If you have NuGet Package Restore enabled, uncomment the next line
134+
#packages/
135+
136+
# Windows Azure Build Output
137+
csx
138+
*.build.csdef
139+
140+
# Windows Store app package directory
141+
AppPackages/
142+
143+
# Others
144+
sql/
145+
*.Cache
146+
ClientBin/
147+
[Ss]tyle[Cc]op.*
148+
~$*
149+
*~
150+
*.dbmdl
151+
*.[Pp]ublish.xml
152+
*.pfx
153+
*.publishsettings
154+
155+
# RIA/Silverlight projects
156+
Generated_Code/
157+
158+
# Backup & report files from converting an old project file to a newer
159+
# Visual Studio version. Backup files are not needed, because we have git ;-)
160+
_UpgradeReport_Files/
161+
Backup*/
162+
UpgradeLog*.XML
163+
UpgradeLog*.htm
164+
165+
# SQL Server files
166+
App_Data/*.mdf
167+
App_Data/*.ldf
168+
169+
#############
170+
## Windows detritus
171+
#############
172+
173+
# Windows image file caches
174+
Thumbs.db
175+
ehthumbs.db
176+
177+
# Folder config file
178+
Desktop.ini
179+
180+
# Recycle Bin used on file shares
181+
$RECYCLE.BIN/
182+
183+
# Mac crap
184+
.DS_Store
185+
186+
187+
#############
188+
## Python
189+
#############
190+
191+
*.py[cod]
192+
193+
# Packages
194+
*.egg
195+
*.egg-info
196+
dist/
197+
build/
198+
eggs/
199+
parts/
200+
var/
201+
sdist/
202+
develop-eggs/
203+
.installed.cfg
204+
205+
# Installer logs
206+
pip-log.txt
207+
208+
# Unit test / coverage reports
209+
.coverage
210+
.tox
211+
212+
#Translations
213+
*.mo
214+
215+
#Mr Developer
216+
.mr.developer.cfg
217+
.gitignore
218+
=======
219+
220+
221+
# Mobile Tools for Java (J2ME)
222+
.mtj.tmp/
223+
224+
# Package Files #
225+
*.jar
226+
*.war
227+
*.ear
228+
229+
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
230+
hs_err_pid*
231+
232+
#ide config
233+
.metadata
234+
.recommenders
235+
236+
237+
*.xml
238+
*.iml
239+
.idea
240+
*.iml
241+
rebel.xml
242+
rebel-remote.xml
243+
244+
.classpath
245+
.project
246+
.setting
247+
.metadata
248+
249+
target
250+
*.class
251+
252+
log
253+
*.log
254+
tmp
255+
*.tmp
256+
257+
.metadata
258+
RemoteSystemsTempFiles
259+
.gitignore
260+
261+
262+
build/
263+
.idea/
264+
.gradle/
2265
*.class
3266
# Mobile Tools for Java (J2ME)
4267
.mtj.tmp/
@@ -20,9 +283,6 @@ rebel.*
20283
.rebel.*
21284

22285
target
23-
24-
#bin/
25-
#.setting/
26-
#*.classpath
27-
#*.project
28-
286+
*.DS_Store
287+
liuxin/.DS_Store
288+
liuxin/src/.DS_Store

0 commit comments

Comments
 (0)