提交 b438d0c3 编写于 作者: BaiXuePrincess's avatar BaiXuePrincess 🐕

Merge branch 'master' into 'p1900'

# Conflicts:
#   .idea/workspace.xml
......@@ -21,18 +21,14 @@
<component name="ChangeListManager">
<list default="true" id="b281f22b-8035-491c-b74b-97f79a4e8672" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/projects/GYT0313/imports.yml" beforeDir="false" afterPath="$PROJECT_DIR$/projects/GYT0313/imports.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/projects/Liangchengdeye/imports.yml" beforeDir="false" afterPath="$PROJECT_DIR$/projects/Liangchengdeye/imports.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/projects/MegEngine/imports.yml" beforeDir="false" afterPath="$PROJECT_DIR$/projects/MegEngine/imports.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/projects/afei-cn/imports.yml" beforeDir="false" afterPath="$PROJECT_DIR$/projects/afei-cn/imports.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/projects/cachecats/imports.yml" beforeDir="false" afterPath="$PROJECT_DIR$/projects/cachecats/imports.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/projects/chenjianqu/imports.yml" beforeDir="false" afterPath="$PROJECT_DIR$/projects/chenjianqu/imports.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/projects/conda-forge/imports.yml" beforeDir="false" afterPath="$PROJECT_DIR$/projects/conda-forge/imports.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/projects/daliansky/imports.yml" beforeDir="false" afterPath="$PROJECT_DIR$/projects/daliansky/imports.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/projects/jetsonhacks/imports.yml" beforeDir="false" afterPath="$PROJECT_DIR$/projects/jetsonhacks/imports.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/projects/project-mirai/imports.yml" beforeDir="false" afterPath="$PROJECT_DIR$/projects/project-mirai/imports.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/projects/tigerguixh/imports.yml" beforeDir="false" afterPath="$PROJECT_DIR$/projects/tigerguixh/imports.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/projects/topjohnwu/imports.yml" beforeDir="false" afterPath="$PROJECT_DIR$/projects/topjohnwu/imports.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/projects/Kenshin/imports.yml" beforeDir="false" afterPath="$PROJECT_DIR$/projects/Kenshin/imports.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/projects/espressif/imports.yml" beforeDir="false" afterPath="$PROJECT_DIR$/projects/espressif/imports.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/projects/gengyanlei/imports.yml" beforeDir="false" afterPath="$PROJECT_DIR$/projects/gengyanlei/imports.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/projects/judasn/imports.yml" beforeDir="false" afterPath="$PROJECT_DIR$/projects/judasn/imports.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/projects/lpty/imports.yml" beforeDir="false" afterPath="$PROJECT_DIR$/projects/lpty/imports.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/projects/yangmyc/imports.yml" beforeDir="false" afterPath="$PROJECT_DIR$/projects/yangmyc/imports.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/projects/zz2summer/imports.yml" beforeDir="false" afterPath="$PROJECT_DIR$/projects/zz2summer/imports.yml" afterDir="false" />
>>>>>>> .idea/workspace.xml
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -105,25 +101,25 @@
</option>
</component>
<component name="WindowStateProjectService">
<state width="1491" height="288" key="GridCell.Tab.0.bottom" timestamp="1608532856382">
<state width="1491" height="288" key="GridCell.Tab.0.bottom" timestamp="1608532387975">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state width="1491" height="288" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1608532856382" />
<state width="1491" height="288" key="GridCell.Tab.0.center" timestamp="1608532856382">
<state width="1491" height="288" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1608532387975" />
<state width="1491" height="288" key="GridCell.Tab.0.center" timestamp="1608532387975">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state width="1491" height="288" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1608532856382" />
<state width="1491" height="288" key="GridCell.Tab.0.left" timestamp="1608532856382">
<state width="1491" height="288" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1608532387975" />
<state width="1491" height="288" key="GridCell.Tab.0.left" timestamp="1608532387974">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state width="1491" height="288" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1608532856382" />
<state width="1491" height="288" key="GridCell.Tab.0.right" timestamp="1608532856382">
<state width="1491" height="288" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1608532387974" />
<state width="1491" height="288" key="GridCell.Tab.0.right" timestamp="1608532387975">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state width="1491" height="288" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1608532856382" />
<state x="401" y="93" width="672" height="676" key="search.everywhere.popup" timestamp="1608533206679">
<state width="1491" height="288" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1608532387975" />
<state x="401" y="93" width="672" height="676" key="search.everywhere.popup" timestamp="1608532572873">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="401" y="93" width="672" height="676" key="search.everywhere.popup/0.0.1536.824@0.0.1536.824" timestamp="1608533206679" />
<state x="401" y="93" width="672" height="676" key="search.everywhere.popup/0.0.1536.824@0.0.1536.824" timestamp="1608532572873" />
</component>
</project>
\ No newline at end of file
---
group:
name: '839Studio'
description: ''
projects:
- name: 'Novel-Coronavirus-Updates'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'BingKui'
description: ''
projects:
- name: 'QuillChineseDoc'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'BlackJocker1995'
description: ''
projects:
- name: 'Apriltag_python'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'DarrenJiang1990'
description: ''
projects:
- name: 'awesome-gateway-securtity'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'FollowExcellence'
description: ''
projects:
- name: 'RecyclerView_Gallery'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'FreeCAD'
description: ''
projects:
- name: 'FreeCAD'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'GajuuzZ'
description: ''
projects:
- name: 'Human-Falling-Detect-Tracks'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'Hph1998'
description: ''
projects:
- name: 'HotelManagement'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'J1Weng'
description: ''
projects:
- name: 'Customer_Management'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'James-Pan0525'
description: ''
projects:
- name: 'vcloud'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'JetsonHacksNano'
description: ''
projects:
- name: 'CSI-Camera'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'JiepengTan'
description: ''
projects:
- name: 'FishManShaderTutorial'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
......@@ -7,4 +7,8 @@ group:
description: ''
mirrorRelease: false
topic: ''
- name: 'gnvm-bin'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'Liu-YT'
description: ''
projects:
- name: 'SingleCycleCPU'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'OfficeDev'
description: ''
projects:
- name: 'ews-java-api'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'OpenMined'
description: ''
projects:
- name: 'PySyft'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'PPPerry'
description: ''
projects:
- name: 'Ryu_projects'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'Presburger'
description: ''
projects:
- name: 'qmc-decoder'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'QLMX'
description: ''
projects:
- name: 'data_mining_models'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'SonarOpenCommunity'
description: ''
projects:
- name: 'sonar-cxx'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'Tatsu-syo'
description: ''
projects:
- name: 'noMeiryoUI'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'TommyZihao'
description: ''
projects:
- name: 'Zihao-Blog'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'V-yg'
description: ''
projects:
- name: 'SSM-layui-maven-'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'WenNicholas'
description: ''
projects:
- name: 'StudentSystem'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'WsmDyj'
description: ''
projects:
- name: 'echarts-for-taro'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'bihansheng'
description: ''
projects:
- name: 'china_city_name'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'bolanlaike'
description: ''
projects:
- name: 'echarts-map'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'booirror'
description: ''
projects:
- name: 'data-structures-and-algorithm-in-c'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'brrd'
description: ''
projects:
- name: 'electron-tabs'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'cas-projects'
description: ''
projects:
- name: 'cas-sample-java-webapp'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'chakki-works'
description: ''
projects:
- name: 'doccano'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'chaolongzhang'
description: ''
projects:
- name: 'tsp'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'chenm1xuexi'
description: ''
projects:
- name: 'springboot-ddd-demo'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'chunxi-alpc'
description: ''
projects:
- name: 'gcx_pacman'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'cmbs2019'
description: ''
projects:
- name: 'Mechrevo-Hackintosh'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'coturn'
description: ''
projects:
- name: 'coturn'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'cowcomic'
description: ''
projects:
- name: 'echarts_example'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'darkSystemCode'
description: ''
projects:
- name: 'VueBlog'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'derekparker'
description: ''
projects:
- name: 'delve'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'diogobernardino'
description: ''
projects:
- name: 'WilliamChart'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'dueeeke'
description: ''
projects:
- name: 'DKVideoPlayer'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
......@@ -47,3 +47,8 @@ group:
description: ''
mirrorRelease: false
topic: ''
- name: 'esp-idf'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'eyebluecn'
description: ''
projects:
- name: 'tank'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'fabric8io'
description: ''
projects:
- name: 'kubernetes-client'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
......@@ -11,3 +11,8 @@ group:
description: ''
mirrorRelease: false
topic: ''
- name: 'reflective-clothes-detect'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'gobuffalo'
description: ''
projects:
- name: 'buffalo'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'guoshijiang'
description: ''
projects:
- name: 'Cryptography_anyone_can_understand'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'gzu-liyujiang'
description: ''
projects:
- name: 'AndroidPicker'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'headwindf'
description: ''
projects:
- name: 'Calculator'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'implus'
description: ''
projects:
- name: 'SKNet'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
......@@ -11,3 +11,4 @@ group:
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'jupyterlab'
description: ''
projects:
- name: 'jupyterlab'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'kellywang1314'
description: ''
projects:
- name: 'react-demo-render'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'knazeri'
description: ''
projects:
- name: 'edge-connect'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'laowuniubi'
description: ''
projects:
- name: 'GraduateDesign'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'leonHua'
description: ''
projects:
- name: 'LFilePicker'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'letscontrolit'
description: ''
projects:
- name: 'ESPEasy'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'ljean'
description: ''
projects:
- name: 'modbus-tk'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
......@@ -7,4 +7,8 @@ group:
description: ''
mirrorRelease: false
topic: ''
- name: 'nlp_base'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'ludewig'
description: ''
projects:
- name: 'MqttDemo'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'luleiyu'
description: ''
projects:
- name: 'wechat-canvas'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'mabel-xue'
description: ''
projects:
- name: '100du.com-html-css'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'mrjbq7'
description: ''
projects:
- name: 'ta-lib'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'mrniko'
description: ''
projects:
- name: 'netty-socketio'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'nginx'
description: ''
projects:
- name: 'nginx'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'pantsel'
description: ''
projects:
- name: 'konga'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'phdsky'
description: ''
projects:
- name: 'ORBSLAM24Windows'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'pissang'
description: ''
projects:
- name: 'clay-viewer'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'ppoffice'
description: ''
projects:
- name: 'hexo-theme-hueman'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'qifengdeqingchen'
description: ''
projects:
- name: 'SeatTable'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'qstumn'
description: ''
projects:
- name: 'BadgeView'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'quanhua92'
description: ''
projects:
- name: 'human-pose-estimation-opencv'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'smoothnlp'
description: ''
projects:
- name: 'FinancialDatasets'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'sonatype'
description: ''
projects:
- name: 'maven-guide-zh'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'tpope'
description: ''
projects:
- name: 'vim-pathogen'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'victorlei'
description: ''
projects:
- name: 'smop'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'vincentwei0919'
description: ''
projects:
- name: 'insightface_for_face_recognition'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'wanghaofei'
description: ''
projects:
- name: 'PriseLayout'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'wangjiwu'
description: ''
projects:
- name: 'entropy-method-matlab-'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'wangyao1052'
description: ''
projects:
- name: 'LitCAD'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'wen-fei'
description: ''
projects:
- name: 'PythonForDataAnalysis'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'wseemann'
description: ''
projects:
- name: 'FFmpegMediaMetadataRetriever'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'x-spiders'
description: ''
projects:
- name: 'aiss-spider'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'xindiyang'
description: ''
projects:
- name: 'coddonGMap'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'xxxxue'
description: ''
projects:
- name: 'Autojs_Rhino_Dex_Self'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
......@@ -7,7 +7,4 @@ group:
description: ''
mirrorRelease: false
topic: ''
- name: jsproxy.git
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'ybdesire'
description: ''
projects:
- name: 'machinelearning'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'yege2006'
description: ''
projects:
- name: 'idea-file-export'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'yrom'
description: ''
projects:
- name: 'ScreenRecorder'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'yyfd2013zy'
description: ''
projects:
- name: 'UvcCameraDemo'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'zelandiya'
description: ''
projects:
- name: 'RAKE-tutorial'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'zhangjingao'
description: ''
projects:
- name: 'sso'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'zhao2613'
description: ''
projects:
- name: 'C-primer-plus'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'zj614android'
description: ''
projects:
- name: 'Svg-'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'zwx230741'
description: ''
projects:
- name: 'quazip'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'zyantific'
description: ''
projects:
- name: 'IDASkins'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
......@@ -23,4 +23,8 @@ group:
description: ''
mirrorRelease: false
topic: ''
- name: 'JavaWeb-Application-Developing-Technology'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'zzz40500'
description: ''
projects:
- name: 'GsonFormat'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
---
group:
name: 'zzzmj'
description: ''
projects:
- name: 'cccc-gplt'
description: ''
mirrorRelease: false
topic: ''
\ No newline at end of file
此差异已折叠。
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册