diff options
| author | Koushik Dutta <koushd@gmail.com> | 2010-07-19 08:43:05 -0700 |
|---|---|---|
| committer | Koushik Dutta <koushd@gmail.com> | 2010-07-19 08:43:05 -0700 |
| commit | 702294d5b8f41668720f4602bbe6ff581c27264e (patch) | |
| tree | f8c7af0272ac8262b64e53154ab8bf73d1084f4d /ui.c | |
| parent | f146bc1b74ebf3825cff6eea717c5b5cb8497932 (diff) | |
| parent | 92077c15d601c47d206fb2ff2ac7898296f2bf17 (diff) | |
| download | bootable_recovery-702294d5b8f41668720f4602bbe6ff581c27264e.zip bootable_recovery-702294d5b8f41668720f4602bbe6ff581c27264e.tar.gz bootable_recovery-702294d5b8f41668720f4602bbe6ff581c27264e.tar.bz2 | |
merge
Change-Id: I25a675887320afd2984523efbc3b7506231ebe4b
Diffstat (limited to 'ui.c')
| -rw-r--r-- | ui.c | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -50,13 +50,8 @@ static int gShowBackButton = 0; 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[] = { @@ -604,4 +599,8 @@ void ui_set_showing_back_button(int showBackButton) { int ui_get_showing_back_button() { return gShowBackButton; +<<<<<<< HEAD +} +======= } +>>>>>>> github/eclair |