diff options
| author | Gergely Nagy <algernon@balabit.hu> | 2012-03-23 11:15:21 +0100 |
|---|---|---|
| committer | Gergely Nagy <algernon@balabit.hu> | 2012-03-23 11:15:21 +0100 |
| commit | f808cdf548fe418e1de4da7e15c3bf93ec06e15e (patch) | |
| tree | 716ddb6b8b39bd6f701b61d20eb1628140dd22f4 | |
| parent | 3b5e136dd6785890f1c8e178cea50bc95dffe660 (diff) | |
| parent | ff0167b3f31cff8314ddf5e948c6e4343ed23165 (diff) | |
Merge branch 'master' into debian
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -18,5 +18,5 @@ Makefile.in /debian/*debhelper* /debian/*substvars /debian/tmp/ -/debian/libcee-syslog-dev/ -/debian/libcee-syslog0/ +/debian/libumberlog-dev/ +/debian/libumberlog0/ |