projects
/
livewp
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6140b2c
)
fixed
author
vlad
<vlad@vlanout.(none)>
Mon, 23 Aug 2010 04:08:03 +0000
(07:08 +0300)
committer
vlad
<vlad@vlanout.(none)>
Mon, 23 Aug 2010 04:08:03 +0000
(07:08 +0300)
applet/src/livewp-settings.c
patch
|
blob
|
history
diff --git
a/applet/src/livewp-settings.c
b/applet/src/livewp-settings.c
index
bcede27
..
93e88af
100644
(file)
--- a/
applet/src/livewp-settings.c
+++ b/
applet/src/livewp-settings.c
@@
-34,11
+34,7
@@
void lw_about(void){
gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
gtk_window_set_modal(GTK_WINDOW(window), TRUE);
vbox = gtk_vbox_new (FALSE, 5);
gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
gtk_window_set_modal(GTK_WINDOW(window), TRUE);
vbox = gtk_vbox_new (FALSE, 5);
-<<<<<<< HEAD
label_about = gtk_label_new (_("Live Wallpaper Version 0.8.5 \n Copyright(c) 2010\n \
label_about = gtk_label_new (_("Live Wallpaper Version 0.8.5 \n Copyright(c) 2010\n \
-=======
- label_about = gtk_label_new (_("Live Wallpaper Version 0.8.2 \n Copyright(c) 2010\n \
->>>>>>> 4606187dfdd5a2cb1fc92aebd5499ef5550944d5
Tanya Makova\n Vlad Vasiliev\n \
Copyright(c) 2010 for design themes Berlin, Modern and Accel Vasya Bobrikov\n \
Copyright(c) 2010 for design theme Matrix and icons Andrew Zhilin\n \
Tanya Makova\n Vlad Vasiliev\n \
Copyright(c) 2010 for design themes Berlin, Modern and Accel Vasya Bobrikov\n \
Copyright(c) 2010 for design theme Matrix and icons Andrew Zhilin\n \