summaryrefslogtreecommitdiff
path: root/client/Piztor/gen/com/macaroon
Commit message (Collapse)AuthorAge
* 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
| * This is alphasjtufs2013-08-25
| |
* | hahahahhahahahahagoblin9112013-08-25
|/
* new project!goblin9112013-08-25