Pid zhugexiaobo

## p4merge4git.md

      
              1 file
            
          
              0 forks
            
          
              0 comments
            
          
              0 stars
            
          
                zhugexiaobo
                / p4merge4git.md
            
            
              Created
              November 26, 2013 16:08
                — forked from tony4d/p4merge4git.md
            
          
    Download and install p4merge


Download the perforce visual tool suite from here: http://www.perforce.com/perforce/downloads/index.html
Copy only the p4merge.app file into your /Applications/ directory

Setup p4merge as a visual mergetool


## CLLocation+Sino.h
//
//  CLLocation+Sino.h
//
//  Created by i0xbean@gmail.com on 13-4-26.
//  火星坐标系转换扩展
//
//  earth（国外 WGS84）, mars（国内 GCJ-02）, bearPaw（百度 BD-09） 坐标系间相互转换
//  未包含 mars2earth. 需要这个可参考 http://xcodev.com/131.html

#import <CoreLocation/CoreLocation.h>
	//
	// CLLocation+Sino.h
	//
	// Created by i0xbean@gmail.com on 13-4-26.
	// 火星坐标系转换扩展
	//
	// earth（国外 WGS84）, mars（国内 GCJ-02）, bearPaw（百度 BD-09）坐标系间相互转换
	// 未包含 mars2earth. 需要这个可参考 http://xcodev.com/131.html

	#import <CoreLocation/CoreLocation.h>