]> git.ipfire.org Git - thirdparty/snapper.git/commitdiff
Merge branch 'list-all-v3' of https://github.com/kdave/snapper into kdave-list-all-v3
authorArvin Schnell <aschnell@suse.de>
Mon, 6 Oct 2014 08:43:41 +0000 (10:43 +0200)
committerArvin Schnell <aschnell@suse.de>
Mon, 6 Oct 2014 08:43:41 +0000 (10:43 +0200)
Conflicts:
package/snapper.changes

1  2 
client/snapper.cc
doc/snapper.xml.in
package/snapper.changes

Simple merge
Simple merge
index 42c11c10376f8cc4eaf1d977f4bcd9f88d28fc11,48e2476a69d63debf1fc3300488f742342a62386..cc04e1d09c168bbadeb1f746f5cba4a2f08765b9
@@@ -1,8 -1,9 +1,14 @@@
+ -------------------------------------------------------------------
+ Fri Oct 3 01:05:01 CEST 2014 - dsterba@suse.cz
+ - add option --all-configs to snapper client, list snapshots from
+   all accessible configs
 +-------------------------------------------------------------------
 +Thu Oct 02 14:46:37 CEST 2014 - aschnell@suse.de
 +
 +- allow to specify command for comparing file
 +
  -------------------------------------------------------------------
  Mon Sep 29 11:55:37 CEST 2014 - aschnell@suse.de