Merge branch 'release/0.2.2'
This commit is contained in:
		
						commit
						60afd02e59
					
				
							
								
								
									
										21
									
								
								LICENSE
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										21
									
								
								LICENSE
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,21 @@ | ||||
| The MIT License (MIT) | ||||
| 
 | ||||
| Copyright (c) 2013 Geff Obscura | ||||
| 
 | ||||
| Permission is hereby granted, free of charge, to any person obtaining a copy | ||||
| of this software and associated documentation files (the "Software"), to deal | ||||
| in the Software without restriction, including without limitation the rights | ||||
| to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||||
| copies of the Software, and to permit persons to whom the Software is | ||||
| furnished to do so, subject to the following conditions: | ||||
| 
 | ||||
| The above copyright notice and this permission notice shall be included in | ||||
| all copies or substantial portions of the Software. | ||||
| 
 | ||||
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||||
| IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||||
| FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||||
| AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||||
| LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||||
| OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||||
| THE SOFTWARE. | ||||
| @ -43,9 +43,14 @@ This is the Developer package. For the development client please see | ||||
| Contribution | ||||
| ============ | ||||
| 
 | ||||
| If you'd like to contribute to Ethereum Go please fork, fix, commit and | ||||
| If you'd like to contribute to Eth please fork, fix, commit and | ||||
| send a pull request. Commits who do not comply with the coding standards | ||||
| are ignored. | ||||
| are ignored. If you send pull requests make absolute sure that you | ||||
| commit on the `develop` branch and that you do not merge to master. | ||||
| Commits that are directly based on master are simply ignored. | ||||
| 
 | ||||
| To make life easier try [git flow](http://nvie.com/posts/a-successful-git-branching-model/) it sets | ||||
| this all up and streamlines your work flow. | ||||
| 
 | ||||
| Coding standards | ||||
| ================ | ||||
|  | ||||
| @ -43,7 +43,7 @@ func ReadConfig(base string) *config { | ||||
| 			} | ||||
| 		} | ||||
| 
 | ||||
| 		Config = &config{ExecPath: path, Debug: true, Ver: "0.2.1"} | ||||
| 		Config = &config{ExecPath: path, Debug: true, Ver: "0.2.2"} | ||||
| 		Config.Log = NewLogger(LogFile|LogStd, 0) | ||||
| 	} | ||||
| 
 | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user