[Lunar-commits] <moonbase> webkit/webkitgtk+-3: resolve file conflict

Michael 'v4hn' Goerner v4hn at lunar-linux.org
Thu May 3 21:44:14 CEST 2012


commit e1493f44b7c55f2738b8a1a6ade00c4293479eb5
Author: Michael 'v4hn' Goerner <v4hn at lunar-linux.org>
Date:   Wed May 2 11:43:33 2012 +0200

    webkit/webkitgtk+-3: resolve file conflict
---
 web/webkit/BUILD       |    2 +-
 web/webkitgtk+-3/BUILD |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/webkit/BUILD b/web/webkit/BUILD
index 3e0b2c2..7151d8b 100644
--- a/web/webkit/BUILD
+++ b/web/webkit/BUILD
@@ -12,6 +12,6 @@
 
   default_build &&
 
-  install 'Programs/GtkLauncher' '/usr/bin/GtkLauncher' 
+  install 'Programs/GtkLauncher' '/usr/bin/GtkLauncher'
 
 ) > $C_FIFO 2>&1
diff --git a/web/webkitgtk+-3/BUILD b/web/webkitgtk+-3/BUILD
index 6844b0f..899482b 100644
--- a/web/webkitgtk+-3/BUILD
+++ b/web/webkitgtk+-3/BUILD
@@ -12,6 +12,6 @@
 
   default_build &&
 
-  install 'Programs/GtkLauncher' '/usr/bin/GtkLauncher' 
+  install 'Programs/GtkLauncher' '/usr/bin/Gtk3Launcher'
 
 ) > $C_FIFO 2>&1


More information about the Lunar-commits mailing list