Merge branch 'release/v20200714' into develop
This commit is contained in:
		
						commit
						74085e5e6f
					
				
							
								
								
									
										2
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							| @ -7,3 +7,5 @@ www/events.xml | |||||||
| www/geolocation.js | www/geolocation.js | ||||||
| www/geolocationTable.js | www/geolocationTable.js | ||||||
| www/stations.xml | www/stations.xml | ||||||
|  | 
 | ||||||
|  | .vscode/settings.json | ||||||
|  | |||||||
| @ -13,7 +13,7 @@ | |||||||
|     curl -s "https://ariadne.geophysik.ruhr-uni-bochum.de/fdsnws/event/1/query?minlat=50&maxlat=54&minlon=3&maxlon=10&minmag=1" | mkGeolocationTable.py > geolocationTable.js |     curl -s "https://ariadne.geophysik.ruhr-uni-bochum.de/fdsnws/event/1/query?minlat=50&maxlat=54&minlon=3&maxlon=10&minmag=1" | mkGeolocationTable.py > geolocationTable.js | ||||||
| 
 | 
 | ||||||
|     License |     License | ||||||
|     Copyright 2014 Kasper D. Fischer <kasper.fischer@rub.de> |     Copyright 2020 Kasper D. Fischer <kasper.fischer@rub.de> | ||||||
| 
 | 
 | ||||||
|     This program is free software: you can redistribute it and/or modify it |     This program is free software: you can redistribute it and/or modify it | ||||||
|     under the terms of the GNU General Public License as published by the Free |     under the terms of the GNU General Public License as published by the Free | ||||||
|  | |||||||
| @ -8,7 +8,7 @@ | |||||||
|     $Id$ |     $Id$ | ||||||
| 
 | 
 | ||||||
|     :license |     :license | ||||||
|     Copyright 2015 Kasper Fischer <kasper.fischer@ruhr-uni-bochum.de> |     Copyright 2020 Kasper Fischer <kasper.fischer@ruhr-uni-bochum.de> | ||||||
| 
 | 
 | ||||||
|     This program is free software; you can redistribute it and/or modify |     This program is free software; you can redistribute it and/or modify | ||||||
|     it under the terms of the GNU General Public License as published by |     it under the terms of the GNU General Public License as published by | ||||||
|  | |||||||
| @ -7,7 +7,7 @@ Subversion information: | |||||||
| $Id$ | $Id$ | ||||||
| 
 | 
 | ||||||
| license: gpl3 | license: gpl3 | ||||||
| Copyright 2012-2015 Seismological Observatory, Ruhr-University Bochum | Copyright 2012-2020 Seismological Observatory, Ruhr-University Bochum | ||||||
| http://www.gmg.ruhr-uni-bochum.de/geophysik/seisobs | http://www.gmg.ruhr-uni-bochum.de/geophysik/seisobs | ||||||
| Contributors: | Contributors: | ||||||
|     Martina Rische <martina.rische@rub.de> |     Martina Rische <martina.rische@rub.de> | ||||||
|  | |||||||
| @ -4,7 +4,7 @@ | |||||||
|  **********************************************************************/ |  **********************************************************************/ | ||||||
| 
 | 
 | ||||||
| /*	License | /*	License | ||||||
| 	Copyright 2014 Kasper D. Fischer <kasper.fischer@rub.de> | 	Copyright 2020 Kasper D. Fischer <kasper.fischer@rub.de> | ||||||
| 
 | 
 | ||||||
| 	This program is free software: you can redistribute it and/or modify it | 	This program is free software: you can redistribute it and/or modify it | ||||||
| 	under the terms of the GNU General Public License as published by the Free | 	under the terms of the GNU General Public License as published by the Free | ||||||
|  | |||||||
| @ -4,7 +4,7 @@ | |||||||
|  **********************************************************************/ |  **********************************************************************/ | ||||||
| 
 | 
 | ||||||
| /*	License | /*	License | ||||||
| 	Copyright 2014 Kasper D. Fischer <kasper.fischer@rub.de> | 	Copyright 2020 Kasper D. Fischer <kasper.fischer@rub.de> | ||||||
| 
 | 
 | ||||||
| 	This program is free software: you can redistribute it and/or modify it | 	This program is free software: you can redistribute it and/or modify it | ||||||
| 	under the terms of the GNU General Public License as published by the Free | 	under the terms of the GNU General Public License as published by the Free | ||||||
|  | |||||||
| @ -4,7 +4,7 @@ | |||||||
|  **********************************************************************/ |  **********************************************************************/ | ||||||
| 
 | 
 | ||||||
| /*	License | /*	License | ||||||
| 	Copyright 2014 Kasper D. Fischer <kasper.fischer@rub.de> | 	Copyright 2020 Kasper D. Fischer <kasper.fischer@rub.de> | ||||||
| 
 | 
 | ||||||
| 	This program is free software: you can redistribute it and/or modify it | 	This program is free software: you can redistribute it and/or modify it | ||||||
| 	under the terms of the GNU General Public License as published by the Free | 	under the terms of the GNU General Public License as published by the Free | ||||||
|  | |||||||
| @ -4,7 +4,7 @@ | |||||||
|  **********************************************************************/ |  **********************************************************************/ | ||||||
| 
 | 
 | ||||||
| /*	License | /*	License | ||||||
| 	Copyright 2014 Kasper D. Fischer <kasper.fischer@rub.de> | 	Copyright 2020 Kasper D. Fischer <kasper.fischer@rub.de> | ||||||
| 
 | 
 | ||||||
| 	This program is free software: you can redistribute it and/or modify it | 	This program is free software: you can redistribute it and/or modify it | ||||||
| 	under the terms of the GNU General Public License as published by the Free | 	under the terms of the GNU General Public License as published by the Free | ||||||
|  | |||||||
| @ -4,7 +4,7 @@ | |||||||
|  **********************************************************************/ |  **********************************************************************/ | ||||||
| 
 | 
 | ||||||
| /*	License | /*	License | ||||||
| 	Copyright 2014 Kasper D. Fischer <kasper.fischer@rub.de> | 	Copyright 2020 Kasper D. Fischer <kasper.fischer@rub.de> | ||||||
| 
 | 
 | ||||||
| 	This program is free software: you can redistribute it and/or modify it | 	This program is free software: you can redistribute it and/or modify it | ||||||
| 	under the terms of the GNU General Public License as published by the Free | 	under the terms of the GNU General Public License as published by the Free | ||||||
|  | |||||||
| @ -4,7 +4,7 @@ | |||||||
|  **********************************************************************/ |  **********************************************************************/ | ||||||
| 
 | 
 | ||||||
| /*	License | /*	License | ||||||
| 	Copyright 2014 Kasper D. Fischer <kasper.fischer@rub.de> | 	Copyright 2020 Kasper D. Fischer <kasper.fischer@rub.de> | ||||||
| 
 | 
 | ||||||
| 	This program is free software: you can redistribute it and/or modify it | 	This program is free software: you can redistribute it and/or modify it | ||||||
| 	under the terms of the GNU General Public License as published by the Free | 	under the terms of the GNU General Public License as published by the Free | ||||||
|  | |||||||
| @ -4,7 +4,7 @@ | |||||||
|  **********************************************************************/ |  **********************************************************************/ | ||||||
| 
 | 
 | ||||||
| /*	License | /*	License | ||||||
| 	Copyright 2014 Kasper D. Fischer <kasper.fischer@rub.de> | 	Copyright 2020 Kasper D. Fischer <kasper.fischer@rub.de> | ||||||
| 
 | 
 | ||||||
| 	This program is free software: you can redistribute it and/or modify it | 	This program is free software: you can redistribute it and/or modify it | ||||||
| 	under the terms of the GNU General Public License as published by the Free | 	under the terms of the GNU General Public License as published by the Free | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user