diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-01-12 03:40:08 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-01-12 03:40:08 -0500 |
| commit | a29fb94ff48cba620e1ac1317f5eef5920ead3ff (patch) | |
| tree | 2fb8e026712bdf7848ea400e25118f6a58824a02 /include/sound/version.h | |
| parent | 52a7a5835173af61b9f6c3038212370d9717526f (diff) | |
| parent | dd3533eca859a6debb1565503ec03e68354e08e0 (diff) | |
Merge commit alsa/devel into topic/misc
Conflicts:
include/sound/version.h
Diffstat (limited to 'include/sound/version.h')
| -rw-r--r-- | include/sound/version.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/version.h b/include/sound/version.h index 1f5d4872d623..7fed23442db8 100644 --- a/include/sound/version.h +++ b/include/sound/version.h | |||
| @@ -1,3 +1,3 @@ | |||
| 1 | /* include/version.h */ | 1 | /* include/version.h */ |
| 2 | #define CONFIG_SND_VERSION "1.0.22" | 2 | #define CONFIG_SND_VERSION "1.0.22.1" |
| 3 | #define CONFIG_SND_DATE "" | 3 | #define CONFIG_SND_DATE "" |