<feed xmlns='http://www.w3.org/2005/Atom'>
<title>piztor/client/Piztor/gen, branch master</title>
<subtitle>Simple location sharing system</subtitle>
<id>https://git.tedyin.com/piztor/atom?h=master</id>
<link rel='self' href='https://git.tedyin.com/piztor/atom?h=master'/>
<link rel='alternate' type='text/html' href='https://git.tedyin.com/piztor/'/>
<updated>2013-08-26T00:50:47Z</updated>
<entry>
<title>purged the repo</title>
<updated>2013-08-26T00:50:47Z</updated>
<author>
<name>Teddy</name>
<email>ted.sybil@gmail.com</email>
</author>
<published>2013-08-26T00:50:47Z</published>
<link rel='alternate' type='text/html' href='https://git.tedyin.com/piztor/commit/?id=7a606637907476942c1f6686137ada6898d7eb14'/>
<id>urn:sha1:7a606637907476942c1f6686137ada6898d7eb14</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Merge branch 'master' of https://github.com/Determinant/piztor</title>
<updated>2013-08-25T13:16:45Z</updated>
<author>
<name>goblin911</name>
<email>goblinliu@gmail.com</email>
</author>
<published>2013-08-25T13:16:45Z</published>
<link rel='alternate' type='text/html' href='https://git.tedyin.com/piztor/commit/?id=2efdc2f20f0306791ced5ec78a1acddfaf086f42'/>
<id>urn:sha1:2efdc2f20f0306791ced5ec78a1acddfaf086f42</id>
<content type='text'>
Conflicts:
	client/Piztor/bin/classes/com/macaroon/piztor/ActMgr.class
	client/Piztor/bin/classes/com/macaroon/piztor/AppMgr.class
	client/Piztor/bin/classes/com/macaroon/piztor/R$drawable.class
	client/Piztor/bin/classes/com/macaroon/piztor/R$id.class
	client/Piztor/bin/classes/com/macaroon/piztor/R$layout.class
	client/Piztor/bin/classes/com/macaroon/piztor/R$menu.class
	client/Piztor/bin/classes/com/macaroon/piztor/R$string.class
	client/Piztor/gen/com/macaroon/piztor/R.java
	client/Piztor/res/values/strings.xml
	client/bin/classes/com/macaroon/piztor/ActStatus.class
	client/bin/classes/com/macaroon/piztor/EmptyStatus.class
	client/bin/classes/com/macaroon/piztor/Setting.class
	client/src/com/macaroon/piztor/AppMgr.java
	client/src/com/macaroon/piztor/Setting.java
</content>
</entry>
<entry>
<title>This is alpha</title>
<updated>2013-08-25T07:45:55Z</updated>
<author>
<name>sjtufs</name>
<email>sjtu_fs@outlook.com</email>
</author>
<published>2013-08-25T07:45:55Z</published>
<link rel='alternate' type='text/html' href='https://git.tedyin.com/piztor/commit/?id=ac7633d8149a28af288ac0b850850cef9b13c151'/>
<id>urn:sha1:ac7633d8149a28af288ac0b850850cef9b13c151</id>
<content type='text'>
</content>
</entry>
<entry>
<title>hahahahhahahahaha</title>
<updated>2013-08-25T07:31:29Z</updated>
<author>
<name>goblin911</name>
<email>goblinliu@gmail.com</email>
</author>
<published>2013-08-25T07:31:29Z</published>
<link rel='alternate' type='text/html' href='https://git.tedyin.com/piztor/commit/?id=e962b84db615005d073b0fb4b5240093a826408f'/>
<id>urn:sha1:e962b84db615005d073b0fb4b5240093a826408f</id>
<content type='text'>
</content>
</entry>
<entry>
<title>new project!</title>
<updated>2013-08-24T23:52:49Z</updated>
<author>
<name>goblin911</name>
<email>goblinliu@gmail.com</email>
</author>
<published>2013-08-24T23:52:49Z</published>
<link rel='alternate' type='text/html' href='https://git.tedyin.com/piztor/commit/?id=1c89054353cc6b1ff8e5849561d548b9648946d1'/>
<id>urn:sha1:1c89054353cc6b1ff8e5849561d548b9648946d1</id>
<content type='text'>
</content>
</entry>
</feed>
