<feed xmlns='http://www.w3.org/2005/Atom'>
<title>piztor/client/Piztor/res, branch push_notification</title>
<subtitle>Simple location sharing system</subtitle>
<id>https://git.tedyin.com/piztor/atom?h=push_notification</id>
<link rel='self' href='https://git.tedyin.com/piztor/atom?h=push_notification'/>
<link rel='alternate' type='text/html' href='https://git.tedyin.com/piztor/'/>
<updated>2013-08-27T18:38:11Z</updated>
<entry>
<title>now can run!!!</title>
<updated>2013-08-27T18:38:11Z</updated>
<author>
<name>Goblin911</name>
<email>goblinliu@gmail.com</email>
</author>
<published>2013-08-27T18:38:11Z</published>
<link rel='alternate' type='text/html' href='https://git.tedyin.com/piztor/commit/?id=0a8315a94d8ed1252f3f96d4ca41ddc632c3bc98'/>
<id>urn:sha1:0a8315a94d8ed1252f3f96d4ca41ddc632c3bc98</id>
<content type='text'>
</content>
</entry>
<entry>
<title>settings almost finished</title>
<updated>2013-08-27T16:55:27Z</updated>
<author>
<name>Goblin911</name>
<email>goblinliu@gmail.com</email>
</author>
<published>2013-08-27T16:55:27Z</published>
<link rel='alternate' type='text/html' href='https://git.tedyin.com/piztor/commit/?id=3baa5dd28c595c497a1669b3f25cda8c52139c87'/>
<id>urn:sha1:3baa5dd28c595c497a1669b3f25cda8c52139c87</id>
<content type='text'>
</content>
</entry>
<entry>
<title>network has fixed and can reach settingsAct</title>
<updated>2013-08-26T14:05:40Z</updated>
<author>
<name>Goblin911</name>
<email>goblinliu@gmail.com</email>
</author>
<published>2013-08-26T14:05:40Z</published>
<link rel='alternate' type='text/html' href='https://git.tedyin.com/piztor/commit/?id=ac55b507e9745b60d4c677ee356a470cb68266e4'/>
<id>urn:sha1:ac55b507e9745b60d4c677ee356a470cb68266e4</id>
<content type='text'>
</content>
</entry>
<entry>
<title>fix some bugs of socket thread</title>
<updated>2013-08-26T09:23:04Z</updated>
<author>
<name>Goblin911</name>
<email>goblinliu@gmail.com</email>
</author>
<published>2013-08-26T09:23:04Z</published>
<link rel='alternate' type='text/html' href='https://git.tedyin.com/piztor/commit/?id=9b17e1808a93840c265123925c2b60e55c2ec930'/>
<id>urn:sha1:9b17e1808a93840c265123925c2b60e55c2ec930</id>
<content type='text'>
</content>
</entry>
<entry>
<title>update ui</title>
<updated>2013-08-26T04:47:18Z</updated>
<author>
<name>sjtufs</name>
<email>sjtu_fs@outlook.com</email>
</author>
<published>2013-08-26T04:47:18Z</published>
<link rel='alternate' type='text/html' href='https://git.tedyin.com/piztor/commit/?id=4431b44e5e5f0aa765a00872cb74303d7bc2db78'/>
<id>urn:sha1:4431b44e5e5f0aa765a00872cb74303d7bc2db78</id>
<content type='text'>
</content>
</entry>
<entry>
<title>init</title>
<updated>2013-08-26T01:15:50Z</updated>
<author>
<name>Goblin911</name>
<email>goblinliu@gmail.com</email>
</author>
<published>2013-08-26T01:15:50Z</published>
<link rel='alternate' type='text/html' href='https://git.tedyin.com/piztor/commit/?id=6400b18210587cb25b475bc2d3979b9a6da5eda4'/>
<id>urn:sha1:6400b18210587cb25b475bc2d3979b9a6da5eda4</id>
<content type='text'>
</content>
</entry>
<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>...</title>
<updated>2013-08-25T13:18:19Z</updated>
<author>
<name>goblin911</name>
<email>goblinliu@gmail.com</email>
</author>
<published>2013-08-25T13:18:19Z</published>
<link rel='alternate' type='text/html' href='https://git.tedyin.com/piztor/commit/?id=0e687f12bd2653adb55ea002b39292678366c525'/>
<id>urn:sha1:0e687f12bd2653adb55ea002b39292678366c525</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>
</feed>
