diff options
| author | Gergely Nagy <algernon@balabit.hu> | 2012-04-13 15:06:05 +0200 |
|---|---|---|
| committer | Gergely Nagy <algernon@balabit.hu> | 2012-04-13 15:06:05 +0200 |
| commit | b10f7121995d9774dece22629598e855f3fa52c4 (patch) | |
| tree | 9bf148c15bb5b46af1c18f3f9b86dc98d0634f15 | |
| parent | dcb06943ad09dd853711ef9fa78d4f2e8a042bba (diff) | |
| parent | 0f62005ae51954abd2c1e3eeb30c11c3877bbe07 (diff) | |
Merge branch 'master' into debian
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -20,3 +20,4 @@ Makefile.in /debian/tmp/ /debian/libumberlog-dev/ /debian/libumberlog0/ +/debian/libumberlog1/ |