Context Navigation

Doxyfile

Timestamp:

Apr 8, 2009, 12:36:08 AM (16 years ago)

Author:

dafrick

Message:

Merging of the current QuestSystem branch.

Location:

code/branches/questsystem5

Files:

Property svn:mergeinfo changed

/code/branches/gui	merged: 2796,2798-2801,2805,2807-2808,2811,2814-2817,2834,2840-2850,2853-2854,2859,2862-2863,2869,2875,2887,2892
/code/branches/miniprojects (added)	merged: 2755,2768,2789,2806,2818-2821,2824
/code/branches/weaponsystem (added)	merged: 2743,2778,2804,2852,2886

-                      r1542
+                      r2907
 #---------------------------------------------------------------------------
 PROJECT_NAME           = Orxonox
 PROJECT_NUMBER         = 0.1.2_Bellatrix
+PROJECT_NUMBER         = 0.0.2_Bellatrix
 OUTPUT_DIRECTORY       =
 CREATE_SUBDIRS         = NO
 …
 #---------------------------------------------------------------------------
 ENABLE_PREPROCESSING   = YES
 MACRO_EXPANSION        = NO
+MACRO_EXPANSION        = YES
 EXPAND_ONLY_PREDEF     = NO
 SEARCH_INCLUDES        = YES

Note: See TracChangeset for help on using the changeset viewer.