piztor - Simple location sharing system

	Commit message (Collapse)	Author	Age
*	settings almost finished	Goblin911	2013-08-28
\|
*	network has fixed and can reach settingsAct	Goblin911	2013-08-26
\|
*	fix some bugs of socket thread	Goblin911	2013-08-26
\|
*	update ui	sjtufs	2013-08-26
\|
*	init	Goblin911	2013-08-26
\|
*	purged the repo	Teddy	2013-08-26
\|
*	...	goblin911	2013-08-25
\|
*	Merge branch 'master' of https://github.com/Determinant/piztor	goblin911	2013-08-25
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	This is alpha	sjtufs	2013-08-25
\| \|
* \|	hahahahhahahahaha	goblin911	2013-08-25
\|/
*	new project!	goblin911	2013-08-25