]> git.ipfire.org Git - thirdparty/snapper.git/commitdiff
Merge branch 'xattrs' of https://github.com/oniko/ok-snap into oniko-xattrs
authorArvin Schnell <aschnell@suse.de>
Tue, 16 Apr 2013 14:55:49 +0000 (16:55 +0200)
committerArvin Schnell <aschnell@suse.de>
Tue, 16 Apr 2013 14:55:49 +0000 (16:55 +0200)
1  2 
VERSION
configure.ac
package/snapper.changes
testsuite-real/.gitignore

diff --cc VERSION
index d917d3e26adc9854b4569871e20111c38de2606f,d917d3e26adc9854b4569871e20111c38de2606f..b1e80bb2480a6db3c4b252661ac61ed945409b32
+++ b/VERSION
@@@ -1,1 -1,1 +1,1 @@@
--0.1.2
++0.1.3
diff --cc configure.ac
Simple merge
index 54223858ce66bb5d6c771ef2e301872acd647c3d,406f098c5133dc682226fc4b4e52504bc3c9a36f..479a41062edc2c0b9889daab97b8e58a1145b84e
@@@ -1,8 -1,3 +1,14 @@@
++-------------------------------------------------------------------
++Tue Apr 16 16:52:29 CEST 2013 - aschnell@suse.de
++
++- merged xattr support from oniko
++- 0.1.3
++
 +-------------------------------------------------------------------
 +Thu Feb 28 18:39:19 CET 2013 - aschnell@suse.de
 +
 +- added filters for lvm
 +
  -------------------------------------------------------------------
  Mon Feb 25 10:54:32 CET 2013 - aschnell@suse.de
  
index b1d5fd08f032e8a74319cb7daaeff4d2d400e421,b1d5fd08f032e8a74319cb7daaeff4d2d400e421..349105970bd8a7f00ff0509934c9e81e8d84bb49
@@@ -11,3 -11,3 +11,5 @@@ error
  error2
  error3
  error4
++xattrs1
++xattrs2