{"head":"bda0c632043d1646fd1fcf8c98c92116e509ea25","size":4,"push_id":45519599,"shas":[["1506800852b9fad1186fad17411aab268fb7c82f","7fb9a9de3898b2002e764de28e98198c9645a618@yahoo.com","Merge branch 'Haydn_Branch'","Haydn"],["b810dc6b9696e79abde9b45c59b061a8aa327bef","b734e51b196060ba4006c8d007262a8b2a54c168@gmail.com","Merge branch 'master' of github.com:DaivdTurnbull/Kwik-Browsa-Conversion into Tabbed_Browser\n\nConflicts:\n\tTestBrowser/bin/org/groupf/kwikbrowsa/KwikBrowsaGUI$1.class\n\tTestBrowser/bin/org/groupf/kwikbrowsa/KwikBrowsaGUI$10.class\n\tTestBrowser/bin/org/groupf/kwikbrowsa/KwikBrowsaGUI$2.class\n\tTestBrowser/bin/org/groupf/kwikbrowsa/KwikBrowsaGUI$3.class\n\tTestBrowser/bin/org/groupf/kwikbrowsa/KwikBrowsaGUI$4.class\n\tTestBrowser/bin/org/groupf/kwikbrowsa/KwikBrowsaGUI$5.class\n\tTestBrowser/bin/org/groupf/kwikbrowsa/KwikBrowsaGUI$6.class\n\tTestBrowser/bin/org/groupf/kwikbrowsa/KwikBrowsaGUI$7.class\n\tTestBrowser/bin/org/groupf/kwikbrowsa/KwikBrowsaGUI$8.class\n\tTestBrowser/bin/org/groupf/kwikbrowsa/KwikBrowsaGUI$9.class\n\tTestBrowser/bin/org/groupf/kwikbrowsa/KwikBrowsaGUI.class\n\tTestBrowser/build/Browser.app/Contents/Resources/Java/browser.jar\n\tTestBrowser/build/browser.jar\n\tTestBrowser/build/browser_ui.jar\n\tTestBrowser/src/org/groupf/kwikbrowsa/KwikBrowsaGUI.java\nMerged with shortcuts.","David Kucsai"],["216f7d751bb9c6c5fc1e32a7b7c581001c00038c","b734e51b196060ba4006c8d007262a8b2a54c168@gmail.com","Implemented adding the current page as a favourite and also deleting a favourite.","David Kucsai"],["bda0c632043d1646fd1fcf8c98c92116e509ea25","b734e51b196060ba4006c8d007262a8b2a54c168@gmail.com","Merge branch 'Tabbed_Browser' of github.com:DaivdTurnbull/Kwik-Browsa-Conversion into Tabbed_Browser","David Kucsai"]],"ref":"refs/heads/Tabbed_Browser"}