Branch master for 1.3

This commit is contained in:
Emmanuele Bassi 2010-03-16 10:44:40 +00:00
parent 4e946f538c
commit 035d571e95

View File

@ -11,8 +11,8 @@
# - increase clutter_micro_version to the next odd number # - increase clutter_micro_version to the next odd number
# - increase clutter_interface_version to the next odd number # - increase clutter_interface_version to the next odd number
m4_define([clutter_major_version], [1]) m4_define([clutter_major_version], [1])
m4_define([clutter_minor_version], [2]) m4_define([clutter_minor_version], [3])
m4_define([clutter_micro_version], [3]) m4_define([clutter_micro_version], [1])
m4_define([clutter_release_status], m4_define([clutter_release_status],
[m4_if(m4_eval(clutter_micro_version % 2), [1], [git], [m4_if(m4_eval(clutter_micro_version % 2), [1], [git],
@ -42,7 +42,7 @@ m4_define([clutter_api_version], [1.0])
# clutter 1.2.10 -> 100 * 2 + 10 = 210, interface age = 4 -> 206 # clutter 1.2.10 -> 100 * 2 + 10 = 210, interface age = 4 -> 206
# ... # ...
# #
m4_define([clutter_interface_age], [3]) m4_define([clutter_interface_age], [0])
m4_define([clutter_binary_age], [m4_eval(100 * clutter_minor_version + clutter_micro_version)]) m4_define([clutter_binary_age], [m4_eval(100 * clutter_minor_version + clutter_micro_version)])
AC_PREREQ([2.59]) AC_PREREQ([2.59])