Merge branch 'master' of https://gitee.com/wcc_140409/libXt
Conflicts: libXt.spec
This commit is contained in:
commit
f3a090ae03
Binary file not shown.
@ -59,8 +59,16 @@ mkdir -p -m 0755 $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults
|
|||||||
%{_docdir}/%{name}/*.xml
|
%{_docdir}/%{name}/*.xml
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
<<<<<<< HEAD
|
||||||
* Fri Jul 24 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.2.0-0
|
* Fri Jul 24 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.2.0-0
|
||||||
- updata package
|
- updata package
|
||||||
|
=======
|
||||||
|
* Wed Jun 19 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.2.0-0
|
||||||
|
- Type:bugfix
|
||||||
|
- Id:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC:change the directory of the license file
|
||||||
|
>>>>>>> bf85ee94b061e41743c911cb5b4fb5c602d76815
|
||||||
|
|
||||||
* Sat Oct 19 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.1.5-11
|
* Sat Oct 19 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.1.5-11
|
||||||
- Type:bugfix
|
- Type:bugfix
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user