summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'master' of ssh://github.com/Determinant/piztorGoblin9112013-08-26
|\
| * fixed a bug in serverTeddy2013-08-26
| |
| * Merge branch 'master' of github.com:Determinant/piztorTeddy2013-08-26
| |\
| * | ptp v0.4 and std-compliant serverTeddy2013-08-26
| | |
* | | add new network, but userinfo need to rewrite.Goblin9112013-08-26
| |/ |/|
* | initGoblin9112013-08-26
| |
* | testGoblin9112013-08-26
|/
* cleaned hidden filesTeddy2013-08-26
|
* purged the repoTeddy2013-08-26
|
* ptp fixedTeddy2013-08-25
|
* ...goblin9112013-08-25
|
* Merge branch 'master' of https://github.com/Determinant/piztorgoblin9112013-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
| * restructured the projectTeddy2013-08-25
| |
| * removed obsolete dirTeddy2013-08-25
| |
| * ptp v3.0a fixedTeddy2013-08-25
| |
| * ptp v3.0a & server timeout supportTeddy2013-08-25
| |
| * place the lastest server files in the correct locationTeddy2013-08-25
| |
| * Merge branch 'master' of github.com:Determinant/piztorTeddy2013-08-25
| |\
| | * add main activity ui logicsjtufs2013-08-25
| | |
| | * Alpha version & fix namesjtufs2013-08-25
| | |
| | * This is alphasjtufs2013-08-25
| | |
| * | ptp v0.3 and std-compliant new server!Teddy2013-08-25
| |/
| * ptp: add TODOTeddy2013-08-25
| |
| * ptp v0.2Teddy2013-08-25
| |
| * ptp revisedTeddy2013-08-25
| |
* | Main is working....goblin9112013-08-25
| |
* | hahahahhahahahahagoblin9112013-08-25
|/
* new project!goblin9112013-08-25
|
* new implementationTeddy2013-08-24
|
* Merge branch 'master' of github.com:Determinant/piztorTeddy2013-08-24
|\
| * Merge branch 'master' of https://github.com/Determinant/piztorMyth Yang2013-08-23
| |\
| * | niceMyth Yang2013-08-23
| | |
* | | ptp revisedTeddy2013-08-24
| |/ |/|
* | Merge branch 'master' of github.com:Determinant/piztorTeddy2013-08-23
|\|
| * jiongMyth Yang2013-08-23
| |
| * idiotMyth Yang2013-08-23
| |
| * idiotMyth Yang2013-08-23
| |
| * idiotMyth Yang2013-08-23
| |
| * asdfgoblin9112013-08-23
| |
| * add activity demogoblin9112013-08-23
| |
| * oopsMyth Yang2013-08-23
| |
* | implemented more in specTeddy2013-08-23
|/
* Merge branch 'master' of github.com:Determinant/piztorTeddy2013-08-23
|\
| * add trackersjtufs2013-08-23
| |
* | ...Teddy2013-08-23
|/
* Merge branch 'master' of github.com:Determinant/piztorTeddy2013-08-23
|\
| * hahahaMyth Yang2013-08-23
| |
| * changedMyth Yang2013-08-23
| |
| * newMyth Yang2013-08-23
| |
* | ...Teddy2013-08-23
| |
Powered by cgit, Themed by Ted Yin.