| 
						
					 | 
					
						
						
							
						
						0936fd032e
					 | 
					
						
						
							
							IU-2022.1 <wangwei-202@KANE_DELL5050 Merge branch 'master'
						
						
						
						
						
						
						
						Conflicts:
	FeatureSuggester.xml 
						
						
					 | 
					
						2022-05-12 11:12:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f72f9a5711
					 | 
					
						
						
							
							IU-2022.1 <wangwei-202@KANE_DELL5050 Update FeatureSuggester.xml
						
						
						
						
						
						
					 | 
					
						2022-05-12 11:11:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						eeb60d9be4
					 | 
					
						
						
							
							IU-2022.1 <Kane@DESKTOP-BSU1BVP Update FeatureSuggester.xml
						
						
						
						
						
						
					 | 
					
						2022-05-11 23:09:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3454495d32
					 | 
					
						
						
							
							IU-2022.1 <Kane@DESKTOP-BSU1BVP Update FeatureSuggester.xml
						
						
						
						
						
						
					 | 
					
						2022-04-23 22:58:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ea4e957027
					 | 
					
						
						
							
							IU-2022.1 <Kane@DESKTOP-BSU1BVP Update FeatureSuggester.xml
						
						
						
						
						
						
					 | 
					
						2022-04-22 23:18:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ef3a7b80e1
					 | 
					
						
						
							
							IU-2022.1 <Kane@DESKTOP-BSU1BVP Merge branch 'master'
						
						
						
						
						
						
						
						Conflicts:
	FeatureSuggester.xml 
						
						
					 | 
					
						2022-04-21 22:10:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						695696cfcc
					 | 
					
						
						
							
							IU-2022.1 <Kane@DESKTOP-BSU1BVP Update FeatureSuggester.xml
						
						
						
						
						
						
					 | 
					
						2022-04-21 22:03:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						41b4408322
					 | 
					
						
						
							
							IU-2022.1 <wangwei-202@KANE_DELL5050 Update FeatureSuggester.xml
						
						
						
						
						
						
					 | 
					
						2022-04-21 09:22:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d1cc97f8f3
					 | 
					
						
						
							
							IU-2022.1 <wangwei-202@KANE_DELL5050 Update FeatureSuggester.xml
						
						
						
						
						
						
					 | 
					
						2022-04-20 17:14:19 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b466df7f4f
					 | 
					
						
						
							
							IU-2022.1 <wangwei-202@KANE_DELL5050 Merge branch 'master'
						
						
						
						
						
						
						
						Conflicts:
	FeatureSuggester.xml 
						
						
					 | 
					
						2022-04-19 14:40:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						23dfe83a51
					 | 
					
						
						
							
							IU-2022.1 <wangwei-202@KANE_DELL5050 Update FeatureSuggester.xml
						
						
						
						
						
						
					 | 
					
						2022-04-19 10:20:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5bd6bcd57a
					 | 
					
						
						
							
							IU-2022.1 <Kane@DESKTOP-BSU1BVP Merge branch 'master'
						
						
						
						
						
						
					 | 
					
						2022-04-18 18:47:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						85f6cb07e1
					 | 
					
						
						
							
							IU-2022.1 <Kane@DESKTOP-BSU1BVP Update FeatureSuggester.xml
						
						
						
						
						
						
					 | 
					
						2022-04-18 18:47:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						397c3254db
					 | 
					
						
						
							
							IU-2022.1 <wangwei-202@KANE_DELL5050 Merge branch 'master'
						
						
						
						
						
						
						
						Conflicts:
	FeatureSuggester.xml 
						
						
					 | 
					
						2022-04-18 17:41:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a7f2b75556
					 | 
					
						
						
							
							IU-2022.1 <wangwei-202@KANE_DELL5050 Create advancedSettings.xml
						
						
						
						
						
						
					 | 
					
						2022-04-18 15:40:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7438e03a36
					 | 
					
						
						
							
							IU-2022.1 <wangwei-202@KANE_DELL5050 Update baseRefactoring.xml
						
						
						
						
						
						
					 | 
					
						2022-04-18 11:28:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9cf4ab809c
					 | 
					
						
						
							
							IU-2022.1 <wangwei-202@KANE_DELL5050 Update FeatureSuggester.xml
						
						
						
						
						
						
					 | 
					
						2022-04-18 09:47:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						36f83c7ce9
					 | 
					
						
						
							
							IU-2022.1 <Kane@DESKTOP-BSU1BVP Merge branch 'master'
						
						
						
						
						
						
						
						Conflicts:
	FeatureSuggester.xml 
						
						
					 | 
					
						2022-04-15 09:59:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6b1f96a9e0
					 | 
					
						
						
							
							IU-2022.1 <Kane@DESKTOP-BSU1BVP Update debugger.xml	Create FeatureSuggester.xml, editor-font.xml
						
						
						
						
						
						
					 | 
					
						2022-04-15 09:59:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						af0e69338f
					 | 
					
						
						
							
							IU-2022.1 <wangwei-202@KANE_DELL5050 Update FeatureSuggester.xml, debugger.xml
						
						
						
						
						
						
					 | 
					
						2022-04-14 11:41:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a2152082e2
					 | 
					
						
						
							
							IU-2022.1 <wangwei-202@KANE_DELL5050 Create DontShowAgainFeedbackService.xml, ProjectCreationInfoService.xml
						
						
						
						
						
						
					 | 
					
						2022-04-13 17:42:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ef545f758c
					 | 
					
						
						
							
							IU-2022.1 <wangwei-202@KANE_DELL5050 Create FeatureSuggester.xml, settingsSyncPlugins.xml, editor-font.xml
						
						
						
						
						
						
					 | 
					
						2022-04-13 16:37:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8ce9fdcc12
					 | 
					
						
						
							
							IU-2022.1 <wangwei-202@KANE_DELL5050 Overwrite local to http://cppdisciple.f3322.org:3000/Kane/idea-config-repo.git
						
						
						
						
						
						
					 | 
					
						2022-04-13 16:27:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						43feb0cfb8
					 | 
					
						
						
							
							IU-2022.1 <wangwei-202@KANE_DELL5050 Update debugger.xml	Create FeatureSuggester.xml, settingsSyncPlugins.xml, editor-font.xml
						
						
						
						
						
						
					 | 
					
						2022-04-13 16:27:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f62a09c318
					 | 
					
						
						
							
							IU-2021.3.3 <Kane@DESKTOP-BSU1BVP Overwrite local to http://cppdisciple.f3322.org:3000/Kane/idea-config-repo.git
						
						
						
						
						
						
					 | 
					
						2022-04-07 19:07:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5182feef04
					 | 
					
						
						
							
							IU-2021.3.3 <wangwei-202@KANE_DELL5050 Update colors.scheme.xml	Create keymap.xml, Windows Proper Redo.xml
						
						
						
						
						
						
					 | 
					
						2022-04-07 11:34:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fbaab1ae58
					 | 
					
						
						
							
							IU-2021.3.3 <wangwei-202@KANE_DELL5050 Overwrite remote http://cppdisciple.f3322.org:3000/Kane/idea-config-repo.git to local
						
						
						
						
						
						
					 | 
					
						2022-04-07 11:10:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						85ccbfad53
					 | 
					
						
						
							
							IU-2021.3.3 <wangwei-202@KANE_DELL5050 Update ignore.xml	Create junitgenerator-app-settings.xml
						
						
						
						
						
						
					 | 
					
						2022-04-06 11:32:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						11ebdc47c8
					 | 
					
						
						
							
							IU-2021.3.3 <wangwei-202@KANE_DELL5050 Update filetypes.xml	Create ignore.xml
						
						
						
						
						
						
					 | 
					
						2022-04-06 11:15:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						76fd94d147
					 | 
					
						
						
							
							IU-2021.3.2 <wangwei-202@KANE_DELL5050 Overwrite remote http://cppdisciple.f3322.org:3000/Kane/idea-config-repo.git to local
						
						
						
						
						
						
					 | 
					
						2022-03-27 13:52:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e1ec9cc4b2
					 | 
					
						
						
							
							IU-2021.3.2 <Kane@DESKTOP-BSU1BVP Overwrite remote http://cppdisciple.f3322.org:3000/Kane/idea-config-repo.git to local
						
						
						
						
						
						
					 | 
					
						2022-03-26 20:46:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						dfc14b06c3
					 | 
					
						
						
							
							IU-2021.3.2 <wangwei-202@KANE_DELL5050 Merge branch 'master'
						
						
						
						
						
						
						
						Conflicts:
	editor.xml
	overrideFileTypes.xml 
						
						
					 | 
					
						2022-03-18 16:45:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4354da35a8
					 | 
					
						
						
							
							IU-2021.3.2 <wangwei-202@KANE_DELL5050 Create editor.xml
						
						
						
						
						
						
					 | 
					
						2022-03-18 14:15:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cf40ac58b3
					 | 
					
						
						
							
							IU-2021.3.2 <wangwei-202@KANE_DELL5050 Update overrideFileTypes.xml
						
						
						
						
						
						
					 | 
					
						2022-03-18 12:42:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d3a8da2004
					 | 
					
						
						
							
							IU-2021.3.2 <Kane@DESKTOP-BSU1BVP Update overrideFileTypes.xml
						
						
						
						
						
						
					 | 
					
						2022-03-17 23:58:19 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b87cc96492
					 | 
					
						
						
							
							IU-2021.3.2 <Kane@DESKTOP-BSU1BVP Create editor.xml
						
						
						
						
						
						
					 | 
					
						2022-03-17 23:32:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f221da5a8c
					 | 
					
						
						
							
							IU-2021.3.2 <Kane@DESKTOP-BSU1BVP Merge branch 'master'
						
						
						
						
						
						
					 | 
					
						2022-03-16 21:16:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						aa94ca33c9
					 | 
					
						
						
							
							IU-2021.3.2 <Kane@DESKTOP-BSU1BVP Create notifications.xml
						
						
						
						
						
						
					 | 
					
						2022-03-16 21:13:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						dc0a4ba131
					 | 
					
						
						
							
							IU-2021.3.2 <wangwei-202@KANE_DELL5050 Update overrideFileTypes.xml, shared-indexes.xml, Default.xml
						
						
						
						
						
						
					 | 
					
						2022-03-16 14:09:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c2d656d5f6
					 | 
					
						
						
							
							IU-2021.3.2 <wangwei-202@KANE_DELL5050 Merge branch 'master'
						
						
						
						
						
						
					 | 
					
						2022-03-16 13:34:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5b095e4427
					 | 
					
						
						
							
							IU-2021.3.2 <wangwei-202@KANE_DELL5050 Update ide-features-trainer.xml
						
						
						
						
						
						
					 | 
					
						2022-03-16 13:34:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b8fb8566b3
					 | 
					
						
						
							
							IU-2021.3.2 <wangwei-202@KANE_DELL5050 Create overrideFileTypes.xml
						
						
						
						
						
						
					 | 
					
						2022-03-16 11:19:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						146c2e6740
					 | 
					
						
						
							
							IU-2021.3.2 <Kane@DESKTOP-BSU1BVP Overwrite local to http://cppdisciple.f3322.org:65310/Kane/jetbrain-settings-respository.git
						
						
						
						
						
						
					 | 
					
						2022-03-15 22:21:24 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c7e3e785ce
					 | 
					
						
						
							
							IU-2021.3.2 <Kane@DESKTOP-BSU1BVP Create ui.lnf.xml
						
						
						
						
						
						
					 | 
					
						2022-03-15 22:21:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						71bd63f0d9
					 | 
					
						
						
							
							IU-2021.3.2 <Kane@DESKTOP-BSU1BVP Overwrite local to http://cppdisciple.f3322.org:65310/Kane/jetbrain-settings-respository.git
						
						
						
						
						
						
					 | 
					
						2022-03-15 22:02:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3c301783cf
					 | 
					
						
						
							
							IU-2021.3.2 <Kane@DESKTOP-BSU1BVP Create find.xml, laf.xml, ui.lnf.xml, ide.general.xml, filetypes.xml, keymap.xml, vcs.xml, nodejs.xml, colors.scheme.xml, debugger.xml
						
						
						
						
						
						
					 | 
					
						2022-03-15 22:02:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c3c5f3aa4d
					 | 
					
						
						
							
							IU-2021.3.2 <wangwei-202@KANE_DELL5050 Overwrite remote http://cppdisciple.f3322.org:65310/Kane/jetbrain-settings-respository.git to local
						
						
						
						
						
						
					 | 
					
						2022-03-15 16:41:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						297a707d53
					 | 
					
						
						
							
							IU-2021.3.2 <wangwei-202@KANE_DELL5050 Create baseRefactoring.xml
						
						
						
						
						
						
					 | 
					
						2022-03-15 15:57:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f544899e58
					 | 
					
						
						
							
							IU-2021.3.2 <wangwei-202@KANE_DELL5050 Create find.xml, nodejs.xml
						
						
						
						
						
						
					 | 
					
						2022-03-14 15:31:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c28441ebf1
					 | 
					
						
						
							
							IU-2021.3.2 <wangwei-202@KANE_DELL5050 Delete editor.xml
						
						
						
						
						
						
					 | 
					
						2022-03-14 15:09:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |