GitHub PushEvent at 2014-06-03 02:54:46
Repository: TrollApp
Actor: ahos2005
Payload: {"shas":[["163a2b8bce38c40438aa68cbaeb4b439a54f97f4","d5095f6ca50a753b672cb11cb8e8899a53ce09a2@gmail.com","updated working version of troll","Joel Abitan",false],["855d96b833dcc6edf158f8ec81dd74e1cf4e226a","d5095f6ca50a753b672cb11cb8e8899a53ce09a2@gmail.com","The newer maps version","Joel Abitan",false],["e41d0e0ccdbf7698ccdd73a4cfffce9b3b36a0d7","d5095f6ca50a753b672cb11cb8e8899a53ce09a2@gmail.com","Arturo's Map Version","Joel Abitan",false],["e23d4457cc9257dcf470f50a1169ef52282bfdca","d5095f6ca50a753b672cb11cb8e8899a53ce09a2@gmail.com","Delete Troll.zip\n\nremoved Troll.zip","Joel Abitan",false],["86d6589db21b3e555c3a4f7c4ca077b805dff6fb","d5095f6ca50a753b672cb11cb8e8899a53ce09a2@gmail.com","added rating system, menu locations, etc","Joel Abitan",false],["8dd7bc4f6105eac46f7fdcabd9d1ca59980f308d","d5095f6ca50a753b672cb11cb8e8899a53ce09a2@gmail.com","Merge branch 'master' of https://github.com/shalomabitan/TrollApp","Joel Abitan",false],["28ea4349a44356999ac77495eaba1ea84d7afca7","d5095f6ca50a753b672cb11cb8e8899a53ce09a2@gmail.com","fixed security profile bug","Joel Abitan",false],["e9370be4252626df72ac88ed0cb198f82e1b2369","402594d92685197b3b329ce53c9728dcc40b30f6@ucsd.edu","worked on maps","Ahmed Elhosseiny",false],["e15a5b177bbb8c29ea79e5922e7bb6d3310ff282","402594d92685197b3b329ce53c9728dcc40b30f6@ucsd.edu","Merge branch 'master' of https://github.com/shalomabitan/TrollApp\n\nConflicts:\n\tTroll/bin/R.txt\n\tTroll/bin/Troll.apk\n\tTroll/bin/classes.dex\n\tTroll/bin/classes/com/google/android/gms/R$drawable.class\n\tTroll/bin/classes/edu/ucsd/troll/app/AlertDialogManager.class\n\tTroll/bin/classes/edu/ucsd/troll/app/LocationMenuActivity$1.class\n\tTroll/bin/classes/edu/ucsd/troll/app/LocationMenuActivity$GetMenu.class\n\tTroll/bin/classes/edu/ucsd/troll/app/LoginActivity.class\n\tTroll/bin/classes/edu/ucsd/troll/app/MapsActivity$1.class\n\tTroll/bin/classes/edu/ucsd/troll/app/MapsActivity$2.class\n\tTroll/bin/classes/edu/ucsd/troll/app/MapsActivity$3.class\n\tTroll/bin/classes/edu/ucsd/troll/app/MapsActivity$4.class\n\nTroll/bin/classes/edu/ucsd/troll/app/MapsActivity$ErrorDialogFragment.cl\nass\n\tTroll/bin/classes/edu/ucsd/troll/app/MapsActivity.class\n\tTroll/bin/classes/edu/ucsd/troll/app/ProfileActivity.class\n\tTroll/bin/classes/edu/ucsd/troll/app/R$drawable.class\n\tTroll/bin/classes/edu/ucsd/troll/app/R$id.class\n\tTroll/bin/classes/edu/ucsd/troll/app/R$integer.class\n\tTroll/bin/classes/edu/ucsd/troll/app/R$layout.class\n\tTroll/bin/classes/edu/ucsd/troll/app/R$menu.class\n\tTroll/bin/classes/edu/ucsd/troll/app/R$string.class\n\tTroll/bin/classes/edu/ucsd/troll/app/R$style.class\n\tTroll/bin/classes/edu/ucsd/troll/app/R$styleable.class\n\tTroll/bin/classes/edu/ucsd/troll/app/SignUpActivity.class\n\tTroll/bin/classes/edu/ucsd/troll/app/SingleMenuItemActivity$1.class\n\tTroll/bin/classes/edu/ucsd/troll/app/SingleMenuItemActivity$2.class\n\tTroll/bin/classes/edu/ucsd/troll/app/SingleMenuItemActivity.class\n\tTroll/bin/resources.ap_\n\tTroll/gen/com/google/android/gms/R.java\n\tTroll/gen/edu/ucsd/troll/app/R.java\n\tTroll/src/edu/ucsd/troll/app/MapsActivity.java\n\tTroll/src/edu/ucsd/troll/app/SingleMenuItemActivity.java","Ahmed Elhosseiny",false],["48b3933f1eb0c285577f1883f9d7548e80cf9217","402594d92685197b3b329ce53c9728dcc40b30f6@ucsd.edu","Merge branch 'master' into Ahmed\n\nConflicts:\n\tTroll/bin/R.txt\n\tTroll/bin/Troll.apk\n\tTroll/bin/classes.dex\n\tTroll/bin/classes/android/support/v7/appcompat/R$layout.class\n\tTroll/bin/classes/com/google/android/gms/R$drawable.class\n\tTroll/bin/classes/edu/ucsd/troll/app/AlertDialogManager.class\n\tTroll/bin/classes/edu/ucsd/troll/app/LocationMenuActivity$1.class\n\tTroll/bin/classes/edu/ucsd/troll/app/LocationMenuActivity$GetMenu.class\n\tTroll/bin/classes/edu/ucsd/troll/app/LocationMenuActivity.class\n\tTroll/bin/classes/edu/ucsd/troll/app/LocationUtils.class\n\tTroll/bin/classes/edu/ucsd/troll/app/LoginActivity.class\n\tTroll/bin/classes/edu/ucsd/troll/app/MainActivity$1.class\n\tTroll/bin/classes/edu/ucsd/troll/app/MainActivity$2.class\n\tTroll/bin/classes/edu/ucsd/troll/app/MainActivity$3.class\n\tTroll/bin/classes/edu/ucsd/troll/app/MainActivity$GetRandomFact.class\n\tTroll/bin/classes/edu/ucsd/troll/app/MainActivity.class\n\nTroll/bin/classes/edu/ucsd/troll/app/MapsActivity$ErrorDialogFragment.cl\nass\n\tTroll/bin/classes/edu/ucsd/troll/app/MapsActivity$GetLocations.class\n\tTroll/bin/classes/edu/ucsd/troll/app/MapsActivity.class\n\tTroll/bin/classes/edu/ucsd/troll/app/MenuActivity$1.class\n\tTroll/bin/classes/edu/ucsd/troll/app/MenuActivity.class\n\tTroll/bin/classes/edu/ucsd/troll/app/ProfileActivity$3.class\n\tTroll/bin/classes/edu/ucsd/troll/app/ProfileActivity.class\n\tTroll/bin/classes/edu/ucsd/troll/app/R$drawable.class\n\tTroll/bin/classes/edu/ucsd/troll/app/R$id.class\n\tTroll/bin/classes/edu/ucsd/troll/app/R$integer.class\n\tTroll/bin/classes/edu/ucsd/troll/app/R$layout.class\n\tTroll/bin/classes/edu/ucsd/troll/app/R$menu.class\n\tTroll/bin/classes/edu/ucsd/troll/app/R$string.class\n\tTroll/bin/classes/edu/ucsd/troll/app/R$style.class\n\tTroll/bin/classes/edu/ucsd/troll/app/R$styleable.class\n\tTroll/bin/classes/edu/ucsd/troll/app/SignUpActivity.class\n\tTroll/bin/classes/edu/ucsd/troll/app/SingleMenuItemActivity$1.class\n\tTroll/bin/classes/edu/ucsd/troll/app/SingleMenuItemActivity$2.class\n\tTroll/bin/classes/edu/ucsd/troll/app/SingleMenuItemActivity.class\n\nTroll/bin/dexedLibs/android-support-v4-bcb2147a4ababda4562b75bf8cb31dd6.\njar\n\nTroll/bin/dexedLibs/android-support-v7-appcompat-176bc804699134aadc05479\n8becab3f4.jar\n\nTroll/bin/dexedLibs/android-support-v7-appcompat-a714d3a51f57f6536b6e6ec\nf030bb9aa.jar\n\nTroll/bin/dexedLibs/google-play-services-08a327414feb04fb57a4bdd5b687408\n3.jar\n\nTroll/bin/dexedLibs/google-play-services_lib-e5eb1253bb1207a030aeb31f302\n603b6.jar\n\tTroll/bin/jarlist.cache\n\tTroll/bin/resources.ap_\n\tTroll/gen/android/support/v7/appcompat/R.java\n\tTroll/gen/com/google/android/gms/R.java\n\tTroll/gen/edu/ucsd/troll/app/R.java\n\tTroll/res/layout/dialogue_menu_navigate.xml\n\tTroll/res/layout/maps_layout.xml\n\tTroll/src/edu/ucsd/troll/app/MapsActivity.java\n\tappcompat_v7/bin/android-support-v7-appcompat.jar","Ahmed Elhosseiny",true]],"size":10,"ref":"refs/heads/Ahmed","head":"48b3933f1eb0c285577f1883f9d7548e80cf9217"}