Merge branch 'master' of github.com:skyjake/Doomsday-Engine

skyjake · Sep 14, 2013 · d656970 · d656970
2 parents e96e5ab + 515a4ca
commit d656970
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/doomsday/client/include/audio/s_sfx.h b/doomsday/client/include/audio/s_sfx.h
@@ -168,4 +168,4 @@ void Sfx_DebugInfo(void);
 #endif
 
 #endif // DENG_CLIENT_SOUND_SFX_H
-#endif __CLIENT__
+#endif // __CLIENT__
diff --git a/doomsday/client/src/ui/widgets/lineeditwidget.cpp b/doomsday/client/src/ui/widgets/lineeditwidget.cpp
@@ -35,8 +35,7 @@ static TimeDelta const ANIM_SPAN = .5f;
 static duint const ID_BUF_TEXT   = 1;
 static duint const ID_BUF_CURSOR = 2;
 
-DENG_GUI_PIMPL(LineEditWidget),
-DENG2_OBSERVES(Atlas, Reposition)
+DENG_GUI_PIMPL(LineEditWidget)
 {
     typedef GLBufferT<Vertex2TexRgba> VertexBuf;
 

diff --git a/doomsday/client/src/world/sectorcluster.cpp b/doomsday/client/src/world/sectorcluster.cpp
@@ -643,4 +643,4 @@ AudioEnvironmentFactors const &Sector::Cluster::reverb() const
     return d->reverb;
 }
 
-#endif __CLIENT__
+#endif // __CLIENT__