From: The PCI ID Mail Robot <pciids@ucw.cz>
Date: Mon, 8 Sep 2008 22:02:37 +0000 (+0200)
Subject: Merge branch 'master' of /home/vorner/pciids
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=27df61715a6a743b97c2f71fdd50a1b4aa63107d;p=pciids.git

Merge branch 'master' of /home/vorner/pciids

Conflicts:

	PciIds/Startup.pm
---

27df61715a6a743b97c2f71fdd50a1b4aa63107d
diff --cc PciIds/Startup.pm
index 04b8945,ee7d9db..2bacade
--- a/PciIds/Startup.pm
+++ b/PciIds/Startup.pm
@@@ -22,7 -22,7 +22,7 @@@ use warnings
  use base 'Exporter';
  
  #Where are data?
- our $directory = '/home/pciids/ids/perl/cf/';
 -our $directory = '/home/vorner/prog/pciids/';
++our $directory = '/home/pciids/ids/perl/';
  our @EXPORT=qw($directory);
  
  #Where are the modules?