Branch: refs/heads/jsmeix_patches_master
Home: https://github.com/yast/yast-printer
Commit: de7bfcc1732c8507c56501933b777456e014b4aa
https://github.com/yast/yast-printer/commit/de7bfcc1732c8507c56501933b777456...
Author: Josef Reidinger
Date: 2015-01-19 (Mon, 19 Jan 2015)
Changed paths:
M Rakefile
M package/yast2-printer.changes
M src/include/printer/connectionwizard.rb
M src/include/printer/driveradd.rb
M src/include/printer/helps.rb
M src/include/printer/overview.rb
M src/include/printer/printingvianetwork.rb
M src/modules/Printer.rb
M tools/cups_client_only
M tools/modify_cupsd_conf
M tools/test_remote_ipp
M tools/test_remote_lpd
M tools/test_remote_novell
M tools/test_remote_smb
M tools/test_remote_socket
Log Message:
-----------
Merge remote-tracking branch 'origin/openSUSE-13_2' into jsmeix_patches_master
Conflicts:
package/yast2-printer.changes