From 6e5851647a8577b1d79592b15037cb57a181c256 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Sat, 26 Jun 2010 12:25:02 -0700
Subject: [PATCH] command line nandroid

---
 ui.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ui.c b/ui.c
index de9d8af..1f7b369 100644
--- a/ui.c
+++ b/ui.c
@@ -44,8 +44,13 @@
 static pthread_mutex_t gUpdateMutex = PTHREAD_MUTEX_INITIALIZER;
 static gr_surface gBackgroundIcon[NUM_BACKGROUND_ICONS];
 static gr_surface gProgressBarIndeterminate[PROGRESSBAR_INDETERMINATE_STATES];
+<<<<<<< HEAD
 static gr_surface gProgressBarEmpty;
 static gr_surface gProgressBarFill;
+=======
+static gr_surface gProgressBarEmpty[NUM_SIDES];
+static gr_surface gProgressBarFill[NUM_SIDES];
+>>>>>>> command line nandroid
 static int ui_has_initialized = 0;
 
 static const struct { gr_surface* surface; const char *name; } BITMAPS[] = {