aboutsummaryrefslogtreecommitdiff
blob: f56e44b2ce34a9401ab30a82bc9f9984d8d39fcb (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
# ChangeLog for sci-libs/nipy-data
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Id$

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
  19 Dec 2015; Horea Christian <h.chr@mail.ru> nipy-data-0.2.ebuild:
  sci-libs/nipy-data: removed unused eclasses, updated description

  17 Dec 2015; Horea Christian <h.chr@mail.ru> nipy-data-0.2.ebuild:
  sci-libs/nipy-data: no stable packages in the overlay

  17 Dec 2015; Horea Christian <h.chr@mail.ru> nipy-data-0.2.ebuild:
  sci-libs/nipy-data: removed emtpy deps

  17 Dec 2015; Horea Christian <h.chr@mail.ru> nipy-data-0.2.ebuild:
  sci-libs/nipy-data: marked package as stable

=======
>>>>>>> 6e709b8... sci-libs/nipy-data: new package
=======
=======
  19 Dec 2015; Horea Christian <h.chr@mail.ru> nipy-data-0.2.ebuild:
  sci-libs/nipy-data: removed unused eclasses, updated description

>>>>>>> 841343a... sci-libs/nipy-data: removed unused eclasses, updated description
  17 Dec 2015; Horea Christian <h.chr@mail.ru> nipy-data-0.2.ebuild:
  sci-libs/nipy-data: no stable packages in the overlay

  17 Dec 2015; Horea Christian <h.chr@mail.ru> nipy-data-0.2.ebuild:
  sci-libs/nipy-data: removed emtpy deps

  17 Dec 2015; Horea Christian <h.chr@mail.ru> nipy-data-0.2.ebuild:
  sci-libs/nipy-data: marked package as stable

>>>>>>> f7adcb4... sci-libs/nipy-data: marked package as stable
*nipy-data-0.2 (16 Dec 2015)

  16 Dec 2015; Horea Christian <h.chr@mail.ru> +metadata.xml,
  +nipy-data-0.2.ebuild:
  sci-libs/nipy-data: new package