Removed some files and updated revs
This commit is contained in:
		
							parent
							
								
									5e227a059e
								
							
						
					
					
						commit
						423d5cff9f
					
				
							
								
								
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							| @ -2,3 +2,4 @@ TeaWeb | ||||
| Web-Client | ||||
| WebClient.zip | ||||
| Web-Client-I18N | ||||
| .idea | ||||
|  | ||||
							
								
								
									
										2
									
								
								.idea/TeaSpeak.iml
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										2
									
								
								.idea/TeaSpeak.iml
									
									
									
										generated
									
									
									
								
							| @ -1,2 +0,0 @@ | ||||
| <?xml version="1.0" encoding="UTF-8"?> | ||||
| <module classpath="CMake" type="CPP_MODULE" version="4" /> | ||||
							
								
								
									
										29
									
								
								.idea/codeStyles/Project.xml
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										29
									
								
								.idea/codeStyles/Project.xml
									
									
									
										generated
									
									
									
								
							| @ -1,29 +0,0 @@ | ||||
| <component name="ProjectCodeStyleConfiguration"> | ||||
|   <code_scheme name="Project" version="173"> | ||||
|     <Objective-C-extensions> | ||||
|       <file> | ||||
|         <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" /> | ||||
|         <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" /> | ||||
|         <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" /> | ||||
|         <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" /> | ||||
|         <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" /> | ||||
|         <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" /> | ||||
|         <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" /> | ||||
|         <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" /> | ||||
|         <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" /> | ||||
|       </file> | ||||
|       <class> | ||||
|         <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" /> | ||||
|         <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" /> | ||||
|         <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" /> | ||||
|         <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" /> | ||||
|         <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" /> | ||||
|         <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" /> | ||||
|       </class> | ||||
|       <extensions> | ||||
|         <pair source="cpp" header="h" fileNamingConvention="NONE" /> | ||||
|         <pair source="c" header="h" fileNamingConvention="NONE" /> | ||||
|       </extensions> | ||||
|     </Objective-C-extensions> | ||||
|   </code_scheme> | ||||
| </component> | ||||
							
								
								
									
										5
									
								
								.idea/codeStyles/codeStyleConfig.xml
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										5
									
								
								.idea/codeStyles/codeStyleConfig.xml
									
									
									
										generated
									
									
									
								
							| @ -1,5 +0,0 @@ | ||||
| <component name="ProjectCodeStyleConfiguration"> | ||||
|   <state> | ||||
|     <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default (1)" /> | ||||
|   </state> | ||||
| </component> | ||||
							
								
								
									
										6
									
								
								.idea/inspectionProfiles/Project_Default.xml
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										6
									
								
								.idea/inspectionProfiles/Project_Default.xml
									
									
									
										generated
									
									
									
								
							| @ -1,6 +0,0 @@ | ||||
| <component name="InspectionProjectProfileManager"> | ||||
|   <profile version="1.0"> | ||||
|     <option name="myName" value="Project Default" /> | ||||
|     <inspection_tool class="EndlessLoop" enabled="false" level="WARNING" enabled_by_default="false" /> | ||||
|   </profile> | ||||
| </component> | ||||
							
								
								
									
										7
									
								
								.idea/misc.xml
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										7
									
								
								.idea/misc.xml
									
									
									
										generated
									
									
									
								
							| @ -1,7 +0,0 @@ | ||||
| <?xml version="1.0" encoding="UTF-8"?> | ||||
| <project version="4"> | ||||
|   <component name="CMakeWorkspace" PROJECT_DIR="$PROJECT_DIR$" /> | ||||
|   <component name="JavaScriptSettings"> | ||||
|     <option name="languageLevel" value="ES6" /> | ||||
|   </component> | ||||
| </project> | ||||
							
								
								
									
										8
									
								
								.idea/modules.xml
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										8
									
								
								.idea/modules.xml
									
									
									
										generated
									
									
									
								
							| @ -1,8 +0,0 @@ | ||||
| <?xml version="1.0" encoding="UTF-8"?> | ||||
| <project version="4"> | ||||
|   <component name="ProjectModuleManager"> | ||||
|     <modules> | ||||
|       <module fileurl="file://$PROJECT_DIR$/.idea/TeaSpeak.iml" filepath="$PROJECT_DIR$/.idea/TeaSpeak.iml" /> | ||||
|     </modules> | ||||
|   </component> | ||||
| </project> | ||||
							
								
								
									
										6
									
								
								.idea/vcs.xml
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										6
									
								
								.idea/vcs.xml
									
									
									
										generated
									
									
									
								
							| @ -1,6 +0,0 @@ | ||||
| <?xml version="1.0" encoding="UTF-8"?> | ||||
| <project version="4"> | ||||
|   <component name="VcsDirectoryMappings"> | ||||
|     <mapping directory="$PROJECT_DIR$" vcs="Git" /> | ||||
|   </component> | ||||
| </project> | ||||
							
								
								
									
										163
									
								
								.idea/workspace.xml
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										163
									
								
								.idea/workspace.xml
									
									
									
										generated
									
									
									
								
							| @ -1,163 +0,0 @@ | ||||
| <?xml version="1.0" encoding="UTF-8"?> | ||||
| <project version="4"> | ||||
|   <component name="CMakeRunConfigurationManager" shouldGenerate="true" shouldDeleteObsolete="true" buildAllGenerated="false"> | ||||
|     <generated /> | ||||
|   </component> | ||||
|   <component name="CMakeSettings"> | ||||
|     <configurations> | ||||
|       <configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" /> | ||||
|     </configurations> | ||||
|   </component> | ||||
|   <component name="ChangeListManager"> | ||||
|     <list default="true" id="82f14300-bc72-4a0b-aff9-578f9bd5703c" name="Default" comment=""> | ||||
|       <change beforePath="" afterPath="$PROJECT_DIR$/libraries/jemalloc" /> | ||||
|       <change beforePath="$PROJECT_DIR$/.gitmodules" afterPath="$PROJECT_DIR$/.gitmodules" /> | ||||
|       <change beforePath="$PROJECT_DIR$/Jenkinsfile" afterPath="$PROJECT_DIR$/Jenkinsfile" /> | ||||
|       <change beforePath="$PROJECT_DIR$/TeaSpeak" afterPath="$PROJECT_DIR$/TeaSpeak" /> | ||||
|       <change beforePath="$PROJECT_DIR$/libraries/CXXTerminal" afterPath="$PROJECT_DIR$/libraries/CXXTerminal" /> | ||||
|       <change beforePath="$PROJECT_DIR$/libraries/boringssl" afterPath="$PROJECT_DIR$/libraries/boringssl" /> | ||||
|       <change beforePath="$PROJECT_DIR$/libraries/build.sh" afterPath="$PROJECT_DIR$/libraries/build.sh" /> | ||||
|     </list> | ||||
|     <ignored path="$PROJECT_DIR$/cmake-build-debug/" /> | ||||
|     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> | ||||
|     <option name="TRACKING_ENABLED" value="true" /> | ||||
|     <option name="SHOW_DIALOG" value="false" /> | ||||
|     <option name="HIGHLIGHT_CONFLICTS" value="true" /> | ||||
|     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> | ||||
|     <option name="LAST_RESOLUTION" value="IGNORE" /> | ||||
|   </component> | ||||
|   <component name="Git.Settings"> | ||||
|     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> | ||||
|   </component> | ||||
|   <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" /> | ||||
|   <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" /> | ||||
|   <component name="JsGulpfileManager"> | ||||
|     <detection-done>true</detection-done> | ||||
|     <sorting>DEFINITION_ORDER</sorting> | ||||
|   </component> | ||||
|   <component name="NodePackageJsonFileManager"> | ||||
|     <packageJsonPaths> | ||||
|       <path value="$PROJECT_DIR$/TeaSpeak/Web-Client/package.json" /> | ||||
|     </packageJsonPaths> | ||||
|   </component> | ||||
|   <component name="ProjectFrameBounds" extendedState="6"> | ||||
|     <option name="x" value="107" /> | ||||
|     <option name="y" value="2156" /> | ||||
|     <option name="width" value="3775" /> | ||||
|     <option name="height" value="2164" /> | ||||
|   </component> | ||||
|   <component name="ProjectInspectionProfilesVisibleTreeState"> | ||||
|     <entry key="Project Default"> | ||||
|       <profile-state> | ||||
|         <expanded-state> | ||||
|           <State> | ||||
|             <id /> | ||||
|           </State> | ||||
|           <State> | ||||
|             <id>BashSupport</id> | ||||
|           </State> | ||||
|         </expanded-state> | ||||
|         <selected-state> | ||||
|           <State> | ||||
|             <id>AWS CloudFormation Inspections</id> | ||||
|           </State> | ||||
|         </selected-state> | ||||
|       </profile-state> | ||||
|     </entry> | ||||
|   </component> | ||||
|   <component name="ProjectView"> | ||||
|     <navigator currentView="ProjectPane" proportions="" version="1"> | ||||
|       <flattenPackages /> | ||||
|       <showMembers /> | ||||
|       <showModules /> | ||||
|       <showLibraryContents /> | ||||
|       <hideEmptyPackages /> | ||||
|       <abbreviatePackageNames /> | ||||
|       <autoscrollToSource /> | ||||
|       <autoscrollFromSource /> | ||||
|       <sortByType /> | ||||
|       <manualOrder /> | ||||
|       <foldersAlwaysOnTop value="true" /> | ||||
|     </navigator> | ||||
|     <panes> | ||||
|       <pane id="ProjectPane"> | ||||
|         <subPane> | ||||
|           <expand> | ||||
|             <path> | ||||
|               <item name="TeaSpeak" type="dad4c3:CidrFilesViewHelper$MyProjectTreeStructure$1" /> | ||||
|               <item name="TeaSpeak" type="462c0819:PsiDirectoryNode" /> | ||||
|             </path> | ||||
|           </expand> | ||||
|           <select /> | ||||
|         </subPane> | ||||
|       </pane> | ||||
|     </panes> | ||||
|   </component> | ||||
|   <component name="PropertiesComponent"> | ||||
|     <property name="WebServerToolWindowFactoryState" value="false" /> | ||||
|     <property name="last_opened_file_path" value="$PROJECT_DIR$/TeaSpeak" /> | ||||
|     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" /> | ||||
|     <property name="nodejs_npm_path_reset_for_default_project" value="true" /> | ||||
|     <property name="settings.editor.selected.configurable" value="preferences.sourceCode.C/C++" /> | ||||
|   </component> | ||||
|   <component name="RunDashboard"> | ||||
|     <option name="ruleStates"> | ||||
|       <list> | ||||
|         <RuleState> | ||||
|           <option name="name" value="ConfigurationTypeDashboardGroupingRule" /> | ||||
|         </RuleState> | ||||
|         <RuleState> | ||||
|           <option name="name" value="StatusDashboardGroupingRule" /> | ||||
|         </RuleState> | ||||
|       </list> | ||||
|     </option> | ||||
|   </component> | ||||
|   <component name="ShelveChangesManager" show_recycled="false"> | ||||
|     <option name="remove_strategy" value="false" /> | ||||
|   </component> | ||||
|   <component name="TaskManager"> | ||||
|     <task active="true" id="Default" summary="Default task"> | ||||
|       <changelist id="82f14300-bc72-4a0b-aff9-578f9bd5703c" name="Default" comment="" /> | ||||
|       <created>1533152440978</created> | ||||
|       <option name="number" value="Default" /> | ||||
|       <option name="presentableId" value="Default" /> | ||||
|       <updated>1533152440978</updated> | ||||
|       <workItem from="1533152448087" duration="49000" /> | ||||
|       <workItem from="1535203104737" duration="22000" /> | ||||
|     </task> | ||||
|     <servers /> | ||||
|   </component> | ||||
|   <component name="TimeTrackingManager"> | ||||
|     <option name="totallyTimeSpent" value="71000" /> | ||||
|   </component> | ||||
|   <component name="ToolWindowManager"> | ||||
|     <frame x="107" y="2156" width="3777" height="2172" extended-state="6" /> | ||||
|     <layout> | ||||
|       <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> | ||||
|       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> | ||||
|       <window_info id="Docker" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> | ||||
|       <window_info id="CMake" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32972974" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> | ||||
|       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> | ||||
|       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> | ||||
|       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> | ||||
|       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="true" content_ui="tabs" /> | ||||
|       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> | ||||
|       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> | ||||
|       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> | ||||
|       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> | ||||
|       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> | ||||
|       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> | ||||
|       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> | ||||
|       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> | ||||
|       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> | ||||
|       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> | ||||
|     </layout> | ||||
|   </component> | ||||
|   <component name="VcsContentAnnotationSettings"> | ||||
|     <option name="myLimit" value="2678400000" /> | ||||
|   </component> | ||||
|   <component name="XDebuggerManager"> | ||||
|     <breakpoint-manager /> | ||||
|     <watches-manager /> | ||||
|   </component> | ||||
| </project> | ||||
| @ -1 +1 @@ | ||||
| Subproject commit eb7af386de1a4497832228e4bdf99b65a25e9da2 | ||||
| Subproject commit f5f0296e9c5b769a23200d2b7c92d5c39c2598db | ||||
							
								
								
									
										1
									
								
								cmake-build-debug/CMakeFiles/clion-log.txt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								cmake-build-debug/CMakeFiles/clion-log.txt
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1 @@ | ||||
| CMakeLists.txt not found in /home/wolverindev/TeaSpeak/server Select CMakeLists.txt file... | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user