| 
							
							
								 Ludger Küperkoch | f738160a8b | Merge branch 'develop' of ariadne.geophysik.rub.de:/data/git/pylot into develop Conflicts:
	autoPyLoT.py | 2015-11-05 08:47:06 +01:00 |  | 
			
				
					|  | 7a47594614 | debugged some code fragments while trying to solve the load event data problem | 2015-09-17 17:45:10 +02:00 |  | 
			
				
					| 
							
							
								 Ludger Küperkoch | bf1194ec3b | Changed?? | 2015-09-01 14:32:36 +02:00 |  | 
			
				
					|  | 623f5d7b7e | [addresses #167] started fixing the multiple phase saving issue | 2015-08-31 13:37:18 +02:00 |  | 
			
				
					| 
							
							
								 Ludger Küperkoch | ab840fbcf1 | Merge branch 'develop' of ariadne.geophysik.rub.de:/data/git/pylot into develop Try to solve conflict, only marginal changes.
Conflicts:
	pylot/core/pick/utils.py | 2015-06-25 11:17:32 +02:00 |  | 
			
				
					|  | 7cab62b97e | release version committed to avoid conflicting files while update | 2015-05-04 12:05:14 +02:00 |  | 
			
				
					|  | 4b641f1b3c | reversed polarity in picking mode | 2015-04-21 08:21:59 +02:00 |  | 
			
				
					|  | d21798f633 | test pickingdialog and prepare figures for the poster | 2015-04-07 15:00:00 +02:00 |  | 
			
				
					|  | 091ab23b90 | version string changed for testing reasons | 2015-02-16 10:32:19 +01:00 |  | 
			
				
					|  | d32b401508 | changed due to testing | 2015-02-13 11:36:44 +01:00 |  | 
			
				
					|  | f6bf37c920 | new package io.py which should contain all import and export routines written by ourselves, such as reading old PILOT phase and location information file; implementation of the readPILOTevent function; new routines in utils: createArrival will be split into two functions: createPick and createArrival; also planned: createOrigin, createAmplitude and createMagnitude as well as giving createEvent functionality | 2015-02-07 09:12:58 +01:00 |  | 
			
				
					|  | 64158174e6 | currently working on the plotting of waveforms; changes made to meet pre-requisites to data plotting | 2015-01-22 16:41:52 +01:00 |  | 
			
				
					|  | b4c19acd99 | release version change due to testing | 2015-01-20 14:02:56 +01:00 |  | 
			
				
					|  | 9e7f20a9fb | create a working MainWindow | 2014-12-08 11:38:24 +01:00 |  | 
			
				
					|  | ef8bd6572e | create a working MainWindow | 2014-12-08 10:26:14 +01:00 |  | 
			
				
					|  | 9603f7127c | imports corrected; menu definition changed | 2014-12-04 05:13:32 +01:00 |  | 
			
				
					|  | e6ac337466 | testing GUI; execution updates RELEASE-VERSION | 2014-12-01 12:46:04 +01:00 |  | 
			
				
					|  | d405e9e6f9 | debug GUI | 2014-11-28 11:15:49 +01:00 |  | 
			
				
					|  | d47623ed65 | implementation of standard icons corrected | 2014-11-27 10:59:34 +01:00 |  | 
			
				
					|  | 094213bd21 | method createAction implemented in order to create menu entries | 2014-11-27 10:13:17 +01:00 |  | 
			
				
					|  | 9ff18c7425 | changes made in order to get the GUI working for the first time | 2014-11-26 08:46:16 +01:00 |  | 
			
				
					|  | 2a385512ee | version number changes each time the Main program is started (should not be the case, to be fixed before release) | 2014-11-21 10:08:18 +01:00 |  | 
			
				
					|  | 86803cdff0 | debugging UI problems to get the main application running | 2014-11-06 15:07:05 +01:00 |  | 
			
				
					|  | dcc3881720 | permissions repaired and QtPyLoT.py started with some MainWindow stuff | 2014-01-10 05:45:03 +01:00 |  |