• Kryzl Deanne Pascual's avatar
    Merge remote-tracking branch 'origin/master' · df3c2863
    Kryzl Deanne Pascual authored
    Conflicts:
    
    	RestaurantOrderingSystem/bin/classes/com/cs123grpE/restaurantorderingsystem/AddEditProfile.class
    
    	RestaurantOrderingSystem/bin/classes/com/cs123grpE/restaurantorderingsystem/Admin.class
    
    	RestaurantOrderingSystem/bin/classes/com/cs123grpE/restaurantorderingsystem/Cart.class
    
    	RestaurantOrderingSystem/bin/classes/com/cs123grpE/restaurantorderingsystem/Customer.class
    
    	RestaurantOrderingSystem/bin/classes/com/cs123grpE/restaurantorderingsystem/EditBill.class
    
    	RestaurantOrderingSystem/bin/classes/com/cs123grpE/restaurantorderingsystem/EditMenu.class
    
    	RestaurantOrderingSystem/bin/classes/com/cs123grpE/restaurantorderingsystem/Kitchen.class
    
    	RestaurantOrderingSystem/bin/classes/com/cs123grpE/restaurantorderingsystem/Login.class
    
    	RestaurantOrderingSystem/bin/classes/com/cs123grpE/restaurantorderingsystem/MainActivity.class
    
    	RestaurantOrderingSystem/bin/classes/com/cs123grpE/restaurantorderingsystem/R$id.class
    
    	RestaurantOrderingSystem/bin/classes/com/cs123grpE/restaurantorderingsystem/R$layout.class
    
    	RestaurantOrderingSystem/bin/classes/com/cs123grpE/restaurantorderingsystem/R$menu.class
    
    	RestaurantOrderingSystem/bin/classes/com/cs123grpE/restaurantorderingsystem/R$string.class
    
    	RestaurantOrderingSystem/bin/classes/com/cs123grpE/restaurantorderingsystem/R$style.class
    
    	RestaurantOrderingSystem/bin/classes/com/cs123grpE/restaurantorderingsystem/Register.class
    
    	RestaurantOrderingSystem/bin/classes/com/cs123grpE/restaurantorderingsystem/SelectAccount.class
    
    	RestaurantOrderingSystem/bin/classes/com/cs123grpE/restaurantorderingsystem/Settings.class
    
    	RestaurantOrderingSystem/bin/classes/com/cs123grpE/restaurantorderingsystem/ViewProfile.class
    
    	RestaurantOrderingSystem/gen/com/cs123grpE/restaurantorderingsystem/R.java
    	RestaurantOrderingSystem/res/layout/activity_add_edit_profile.xml
    df3c2863
Name
Last commit
Last update
..
AddEditProfile.java Loading commit data...
Admin.java Loading commit data...
Cart.java Loading commit data...
Customer.java Loading commit data...
EditBill.java Loading commit data...
EditMenu.java Loading commit data...
ExpandableAdapter.java Loading commit data...
Kitchen.java Loading commit data...
Login.java Loading commit data...
MainActivity.java Loading commit data...
MenuListItem.java Loading commit data...
Register.java Loading commit data...
SelectAccount.java Loading commit data...
Settings.java Loading commit data...
User.java Loading commit data...
ViewProfile.java Loading commit data...