merge default tip
authorMichael Smith <smithm@netapps.com.au>
Wed Mar 24 20:33:17 2010 +1100 (2010-03-24)
changeset 297863b399b0b9
parent 26 29322d00a2d4
parent 27 f736a5a8cf86
merge
.hgtags
Makefile
Makefile.openmoko
     1.1 --- a/.hgtags	Tue Mar 23 17:29:45 2010 +1100
     1.2 +++ b/.hgtags	Wed Mar 24 20:33:17 2010 +1100
     1.3 @@ -2,3 +2,4 @@
     1.4  4c91e5728c6a30b46a939b4c2dd159a7bacc5ca5 0.2
     1.5  1b8eb18424e0357116e992820af044561860aca9 0.3
     1.6  0a0ca6e892a9a4145a6fd1010b91858b01258f35 1.0
     1.7 +29322d00a2d45277734573393d2e2590f33e8845 1.1
     2.1 --- a/Makefile	Tue Mar 23 17:29:45 2010 +1100
     2.2 +++ b/Makefile	Wed Mar 24 20:33:17 2010 +1100
     2.3 @@ -13,7 +13,7 @@
     2.4  
     2.5  CFLAGS=-I/usr/local/include/eina-0 -I/usr/local/include/eina-0/eina
     2.6  LDFLAGS=-L/usr/local/lib -ledje -lecore -lecore_evas -lelementary -L /usr/lib -lsqlite3
     2.7 -VERSION:=$(shell hg log --follow --template "{tags}\n" | grep -v tip | head -1)
     2.8 +VERSION:=$(shell utilities/get-version-number.ksh)
     2.9  
    2.10  all: $(objects)
    2.11  	gcc $(LDFLAGS) -o elmessage $(objects)
     3.1 --- a/Makefile.openmoko	Tue Mar 23 17:29:45 2010 +1100
     3.2 +++ b/Makefile.openmoko	Wed Mar 24 20:33:17 2010 +1100
     3.3 @@ -12,7 +12,7 @@
     3.4  # make -f Makefile.openmoko
     3.5  
     3.6  objects=elmessage.o
     3.7 -VERSION:=$(shell hg log --follow --template "{tags}\n" | grep -v tip | head -1)
     3.8 +VERSION:=$(shell utilities/get-version-number.ksh)
     3.9  
    3.10  .SUFFIXES:      .o .c
    3.11