GitHub PushEvent at 2014-01-16 21:06:55
Repository: Programming
Actor: John-Snoap
Payload: {"shas":[["f87e10d0d4f540c2cc585991ab728c7fadce0ba2","55d2da7b30592e7055b35535ce4a1e68b3d09ce9@wq0161elagum.oc.edu","I hope this doesn't break","John-Snoap",true],["b0a30052733c5b3c2dd60b902bd3001485ee98f1","55d2da7b30592e7055b35535ce4a1e68b3d09ce9@wq0161elagum.oc.edu","Merge branch 'master' of https://github.com/John-Snoap/Programming\n\nConflicts:\n.gitignore\nNetwork Systems Design/workspace/.metadata/.log\nNetwork Systems\nDesign/workspace/.metadata/.plugins/org.eclipse.cdt.core/.log\nNetwork Systems\nDesign/workspace/.metadata/.plugins/org.eclipse.core.resources/.projects\n/MyFirstApp/.indexes/a0/d6/properties.index\nNetwork Systems\nDesign/workspace/.metadata/.plugins/org.eclipse.core.resources/.projects\n/MyFirstApp/.indexes/a0/de/properties.index\nNetwork Systems\nDesign/workspace/.metadata/.plugins/org.eclipse.core.resources/.projects\n/MyFirstApp/.indexes/properties.index\nNetwork Systems\nDesign/workspace/.metadata/.plugins/org.eclipse.core.resources/.projects\n/MyFirstApp/org.eclipse.jdt.core/state.dat\nNetwork Systems\nDesign/workspace/.metadata/.plugins/org.eclipse.core.resources/.root/.in\ndexes/properties.index\nNetwork Systems\nDesign/workspace/.metadata/.plugins/org.eclipse.core.resources/.safetabl\ne/org.eclipse.core.resources\nNetwork Systems\nDesign/workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/c\nom.android.ide.eclipse.adt.prefs\nNetwork Systems\nDesign/workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/c\nom.android.ide.eclipse.ddms.prefs\nNetwork Systems\nDesign/workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/o\nrg.eclipse.cdt.debug.core.prefs\nNetwork Systems\nDesign/workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/o\nrg.eclipse.debug.ui.prefs\nNetwork Systems\nDesign/workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/o\nrg.eclipse.jdt.core.prefs\nNetwork Systems\nDesign/workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/o\nrg.eclipse.jdt.ui.prefs\nNetwork Systems\nDesign/workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/o\nrg.eclipse.ui.editors.prefs\nNetwork Systems\nDesign/workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/o\nrg.eclipse.ui.ide.prefs\nNetwork Systems\nDesign/workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/o\nrg.eclipse.wst.sse.core.prefs\nNetwork Systems\nDesign/workspace/.metadata/.plugins/org.eclipse.debug.ui/dialog_settings\n.xml\nNetwork Systems\nDesign/workspace/.metadata/.plugins/org.eclipse.debug.ui/launchConfigura\ntionHistory.xml\nNetwork Systems\nDesign/workspace/.metadata/.plugins/org.eclipse.e4.workbench/workbench.x\nmi\nNetwork Systems\nDesign/workspace/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames\n.txt\nNetwork Systems\nDesign/workspace/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeName\nHistory.xml\nNetwork Systems\nDesign/workspace/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.x\nml\nNetwork Systems\nDesign/workspace/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.x\nml\nNetwork Systems\nDesign/workspace/.metadata/.plugins/org.eclipse.ui.workbench/dialog_sett\nings.xml\nNetwork Systems\nDesign/workspace/.metadata/.plugins/org.eclipse.ui.workbench/workingsets\n.xml\nNetwork Systems Design/workspace/MyFirstApp/.classpath\nNetwork Systems Design/workspace/MyFirstApp/.project\nNetwork Systems\nDesign/workspace/MyFirstApp/.settings/org.eclipse.jdt.core.prefs\nNetwork Systems Design/workspace/MyFirstApp/bin/AndroidManifest.xml\nNetwork Systems Design/workspace/MyFirstApp/bin/MyFirstApp.apk\nNetwork Systems Design/workspace/MyFirstApp/bin/classes.dex\nNetwork Systems\nDesign/workspace/MyFirstApp/bin/dexedLibs/android-support-v4-6048ecda481\n477fc1eba15da9a79dbd2.jar\nNetwork Systems Design/workspace/MyFirstApp/bin/jarlist.cache\nNetwork Systems\nDesign/workspace/MyFirstApp/bin/res/crunch/drawable-hdpi/ic_launcher.png\nNetwork Systems\nDesign/workspace/MyFirstApp/bin/res/crunch/drawable-mdpi/ic_launcher.png\nNetwork Systems\nDesign/workspace/MyFirstApp/bin/res/crunch/drawable-xhdpi/ic_launcher.pn\ng\nNetwork Systems\nDesign/workspace/MyFirstApp/bin/res/crunch/drawable-xxhdpi/ic_launcher.p\nng\nNetwork Systems Design/workspace/MyFirstApp/bin/resources.ap_","John-Snoap",true],["08a801dcb485aa86bdc62f317bf855291975d391","55d2da7b30592e7055b35535ce4a1e68b3d09ce9@wq0161elagum.oc.edu","please work","John-Snoap",true],["9c04cb8b0fb85883956ce879064039c01785380d","55d2da7b30592e7055b35535ce4a1e68b3d09ce9@wq0161elagum.oc.edu","hopefully this works","John-Snoap",true]],"size":4,"ref":"refs/heads/master","head":"9c04cb8b0fb85883956ce879064039c01785380d"}