Merge branch 'development' into update_github
This commit is contained in:
		
						commit
						476d4488d0
					
				
					 1 changed files with 3 additions and 3 deletions
				
			
		
							
								
								
									
										6
									
								
								debian/copyright
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										6
									
								
								debian/copyright
									
										
									
									
										vendored
									
									
								
							| 
						 | 
				
			
			@ -36,9 +36,9 @@ License: Expat
 | 
			
		|||
        SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 | 
			
		||||
 | 
			
		||||
License: GPL-2
 | 
			
		||||
 	This program is free software; you can redistribute it and/or modify
 | 
			
		||||
 	it under the terms of the GNU General Public License version 2 as
 | 
			
		||||
 	published by the Free Software Foundation.
 | 
			
		||||
        This program is free software; you can redistribute it and/or modify
 | 
			
		||||
        it under the terms of the GNU General Public License version 2 as
 | 
			
		||||
        published by the Free Software Foundation.
 | 
			
		||||
        .
 | 
			
		||||
        This program is distributed in the hope that it will be useful,
 | 
			
		||||
        but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue