labofsahil/github-event-dataset-2012 huggingface dataset:
Fixed build errors with gcc 4.7.0
IDL: Added maAutostart.
Symbian: Implemented maAutostart on 3rd and 5th editions.

Conflicts:

	runtimes/cpp/platforms/symbian/inc/Platform.h
	runtimes/cpp/platforms/symbian/inc/SyscallImpl.h
	runtimes/cpp/platforms/symbian/server/ClientServer.h
	runtimes/cpp/platforms/symbian/server/MoSyncServer.cpp
	runtimes/cpp/platforms/symbian/server/MoSyncServer.mmp
	runtimes/cpp/platforms/symbian/server/MoSyncServer.pkg
	runtimes/cpp/platforms/symbian/src/Client.cpp
	runtimes/cpp/platforms/symbian/src/SyscallImpl.cpp
	testPrograms/keyCapture/main.cpp
	tools/RuntimeBuilder/BuildS60.rb
	tools/idl2/maapi.idl
Symbian: Fixed a few bugs with the server.

Conflicts:

	runtimes/cpp/platforms/symbian/src/Client.cpp
Symbian server: fixed a crash bug in the Autostart database loader.
s60v2: Fixed build errors.

Conflicts:

	runtimes/cpp/platforms/symbian/inc/AppView.h
	runtimes/cpp/platforms/symbian/src/AppUi.cpp
Symbian: Added IOCTLs for controlling the Internet Access Point (IAP).
intlibs/hashmap: Fixed a bug in close().

Conflicts:

	runtimes/cpp/platforms/symbian/src/SyscallImpl.cpp
	tools/idl2/maapi.idl
Symbian: Implemented maNetworkStatus and EVENT_TYPE_NETWORK.

Conflicts:

	runtimes/cpp/platforms/symbian/server/ClientServer.h
	runtimes/cpp/platforms/symbian/server/GetNetworkInfo.cpp
	runtimes/cpp/platforms/symbian/server/MoSyncServer.cpp
	runtimes/cpp/platforms/symbian/server/MoSyncServer.h
	runtimes/cpp/platforms/symbian/server/MoSyncServer.pkg
	runtimes/cpp/platforms/symbian/sis-ed3/MoSync-guido.pkg
	runtimes/cpp/platforms/symbian/sis-ed3/MoSync-server.pkg
	runtimes/cpp/platforms/symbian/sis-ed3/MoSync-template.pkg
	runtimes/cpp/platforms/symbian/sis-ed3/MoSync.pkg
	runtimes/cpp/platforms/symbian/sis-ed5/MoSync-template.pkg
	runtimes/cpp/platforms/symbian/sis-ed5/MoSync.pkg
	runtimes/cpp/platforms/symbian/src/SyscallImpl.cpp
	tools/idl2/maapi.idl
Implemented MA_IAP_METHOD_WLAN.
Symbian: Implemented maSetIapFilter().
Disable NetworkStatus events; it would cause a freeze in DestructNetworking().
Symbian autostart & IAP support: Fixed remaining errors and conflicts.
Todo: sign server binary.
Fix for MOSYNC-2366 "OptionsMenu Test doesn't compile".
Merge branch 'ThreeOneOne' into symbian-autostart
Networking mutex: reverted commit f2965ddc85219d865f5d75a8c80420847058fa0f.
This fixes a deadlock that would occur whenever an operation was started while a waiting op was already in progress.
See the BluetoothServer example.
Common ground fix between MOSYNC-2371 (bluetooth crash on Symbian) and MOSYNC-2344 (downloader crash on ios)
Merge pull request #237 from iraklisrossis/ThreeOneOne

Common ground fix between MOSYNC-2371 (bluetooth crash on Symbian) and M...
Merge pull request #236 from divineprog/master

[MOSYNC-2367] tools/package: Fixed bug in Android manifest generation causing an app to start multiple instances ...
Symbian: Signed MoSyncServer, version 1.5.0.
MOSYNC-2269 update: provide readMe info for the server-side app
Merge pull request #239 from emmaTresanszki/ThreeOneOne

MOSYNC-2269 update: provide readMe info for the server-side app
Again, flushing changes.

--HG--
branch : java
Preview of the lazy-eval-flow-graph-solver.

--HG--
branch : java
Whitespace changes
Added a TODO
Added API response caching via Rack::Cache.
Version bump to 0.0.2.alpha1
holy shit, what are you doing
leave only ruby 1.9.3 for travis
fixing all day long
De-indent flyout tests.
Add ButtonHrefs plugin for data-winning-href.
Use domify (my fork). Fixes #26.
Use `addEventListener` instead of `onactivated`/`oncheckpoint`.

Closes #2.
Allow static options as well as option factories for flyouts.

Closes #19.
Use `_.has(options, …)` instead of `options.hasOwnProperty(…)`.

Closes #30 for flyouts, and fixes Presenter as well.
Throw noisily if flyout markup mismatches flyout map.

Fixes #31.
Extra sheet
Nog iets
Met voorbeelden uit de les
di slides
bump version to 0.1.1
Release 0.1.1
converted manyToMany tests to use "it"
fixed admin bug in User model
Run current Python file with CMD+r
Disables GSL and GLPK
Add Sort Art
Updated README: explain why we can't use setuid
[JBRULES-3655] dispose the ksession after having executed a command on the stateless session
replace tabs by spaces + add copyright header in new files + remove xls lock
reformat code style of bulk-importer code
findbugs: performance increases: use map iterator instead of key + value iteration
code style
move TestRuleDeployment into src/test/java
Replace System.out's and custom Logger with SLF4j and Logback + fail-fast when things go wrong
fix bugs of ignoring inputStream.read() return value + replace NIH code by commons-io
Bigger default window
added splice iso fugitive
minor fix for frascati
fix nullpointer on stopNode
fix webserver API
fix psot parameter management
fix service message management for remote channel
Add example filings
Merge branch 'master' of https://github.com/bycoffe/fec-guide
added ftp data descriptions
finished summary ftp files section
Fix atmel ts.
Site updated at 2012-10-13 16:49:26 UTC
Fix image path with no extension in chap-01
Merge pull request #5 from Benjamin-Ds/master

Fix image path with no extension in chap-01
Atualização
Merge https://github.com/edersonsandre/CRM
Merge https://github.com/edersonsandre/CRM
Merge https://github.com/edersonsandre/CRM
Merge https://github.com/edersonsandre/CRM
Merge https://github.com/edersonsandre/CRM
application/forms/Usuario.php
Merge pull request #15 from professorwaldir/master

acertando login
cart sku poly
Styling changes for the about section
Merge branch 'master' of github.com:edmore/edmoremoyo
tiny change to visibility
prohibited shaddowing this and better this representation in ast
Updated version for eea.eggmonkeytesttarget to 3.6-dev
TODO note about null futures
first step to combine comm_node with req_node
Merge pull request #8 from egnyte/master

Terminate the unix socket command with a semicolon instead of a line feed
add a license for folks needing ./LICENSE
add contributors @blovett, @till, @sgonyea, @jbarbuto
ws
Converted to gem. Fixed compatibility issues with Ruby 1.9. Capture NOENT exceptions and print errors cleanly.
Merge pull request #9 from osterman/master

Converted to RubyGem, compatibility issues with Ruby 1.9, changed UNIX socket communication
add @osterman as a contributor
update contributors
cut 0.2.0
updated if statements to use == instead of =
Merge pull request #10 from mhald/master

updated if statements to use == instead of =
- Added EX2SimpleConnectionQueue
removed extra space from synopsis
Updates Windows installer to avoid warning during compilation with NSIS (#46)

Work well on Windows XP but not really on Windows 7
fixed some views for daily and monthly charting
Allow -S to specify sqlite3 DB in krb5_admin.
added code to the folder
Merge branch 'master' of github.com:elvvapo/BlastUnit
commit
changed table highlighting
refactored, added new graphics, added HUD outline
Fixed CANVAS Activity
Fix transition in Canvas
MARCADORES CORRECCION.
Se trabajó en caso de uso 0101
link to dot enter on the main page
fixed some issues with the ui. added simple example
bump version for cache bust
tributary now more of a class, can instanciate multiple tributaries per page, see double.html
bug with div display
minor problem with editor class
First draft of hiding-panel button
Merge branch 'master' of github.com:enjalot/tributary
Fixing hiding-panel button bug (wasn't compiled into tributary.js)
Adding inlet files as tabs, messing up require
Merge branch 'minimal' of github.com:enjalot/tributary
removed (deprecated) string module dependence; resolved libgphoto 2.4.8 USB path problem
clean up libgphoto2dll definition
Added a setup.py file to install the module
Added method for exporting data for Gtk Pixbuf objects.
Fix retreiving of ctypes value.
Merge branch 'master' of https://github.com/jacobmarble/piggyphoto
Merge branch 'master' of https://github.com/Dreamsorcerer/piggyphoto
Fixed bug causing possible truncation of context memory address to 32 bits when used on systems with over 4GB of memory.
Replaced ctypes.pointer with faster ctypes.byref
Refactoring to use standard python naming conventions.
Fixed widget properties and added choices property.
Pre-split checkin.
Refactor naming fix.
Auto-closing of camera native object implemented. Examples now close camera explicitly after use. Readme Fix.
Determines the correct library name to use based on platform. Kills PTPCamera on OS X (see section "gPhoto2 USAGE" on http://photolifetoys.blogspot.co.uk/2012/08/control-your-camera-with-gphoto2-via.html).
Merge pull request #1 from edwardbarnard/master

Forward
Same updates for TeX output
porttree.py: tweak deprecated constructor params

Trigger a DeprecationWarning even when None is passed in for one of the
deprecated parameters, ensuring that any potentially unsafe usage
triggers the warning.
Add new fields on register page
(Hopefully) finished making the projectile targeting accurate.
make sure a build has occured when running tests
version bump 0.0.8a
move to mbp
* missing dash in Pod SYNOPSIS
* XTerm::Conf may work also for rxvt
* inc'd 0.07_50
* updated MANIFEST
* 10-xterm.t tests also rxvt and urxvt
* Changes for 0.07_50
* more gitignore
Use cookie access to save the userId
Progres bar on the launcher
getting rid of nvidia/ati specific stuff as suggested by Gir
generic: Remove references to non-existent functions CM_MarkFragments
and CM_LerpTag - tu ztm
http://icculus.org/pipermail/quake3-commits/2012-November/002279.html
game: clean up of g_weapon.c
game: g_etbot_interface.cpp warning fix
client saving a syscall each trapRegister
Merge branch 'master' of https://github.com/etlegacy/etlegacy.git
Added support to class ip ban
Fix for Boost pplib bustage from latest gcc
Changed shared_ptr fwd decl to mmboost namespace
Adding new power save scripts

 - rc.local for initial system settings
 - hdparm settings
Make pm-util scripts comply with naming standards
StaticPages added
Is this working?
Finished static pages
fix Entity initialization/registration, fix publish/subscribe routines
remove local reload
adding .sh to gitignore
ignoring .sh
Added very beta GUI using ncurses.
Fixed hardcoded device name issue. 
Cleaned up GUI. Now shows all devices.
Added library for ncurses functions.
Fixed segfault issue. Added usage information. Now stores data in
/tmp. General tidy up.
Fixes for VS2010 compatibility
readme fix
readme update 2
Merge branch 'feature/readme_update' into develop
Merge branch 'release/initial_release'
fix YouTubeIE on 2.6, sorry
Mark CollegeHumorIE not working until phihag finishes
Restrict more characters (Closes #566)
Merge branch 'master' of github.com:rg3/youtube-dl
Update download tests
Mark broken IEs in --list-extractors
Correct exception raising
Check during test runtime instead of test generation for _WORKING, and add 2.6 compat
Allow youtube_dl/__main__.py to be called directly
removed __main__.py from the root of the repo
Fix 2.6 nosetests
Merge branch 'master' of github.com:rg3/youtube-dl
Enable travis notifications
Add irc channel notice
Fix MD5 calculation
Fix Soundcloud IE (+ Python3 support)
Add test for Youku (Mentioned in #314)
Improve execution tests
Merge branch 'master' of git://github.com/rg3/youtube-dl
Babe.sort(key=) => Babe.sort(field=)
Added delete_partition in push sql (issue a DELETE for existing objets matching the partition value before insertion)
Add board: xmastree
Tweak portrait mode for very narrow displays
fixed http.get for v0.6.x
users controller
users controller
Changed smart-tab repo url to original.
Added multi-web-mode to bytecompile
Group SCSS buffers in to CSS
Updated submodules
New SkillLabels added only if they "fit" in container
Add random Skills to cells
remove user.level_of_study
Remove smith-cat from gemspec.
ITS WORK MOFO
Updating readme/details
add rules tinybrowser
rules tinybrowser edit
rules tinybrowser folders
rules uploads
rules upload
rules upload
Merge pull request #39 from pashager/patch-17

Patch 17
Added support for checking against spy-calls
Updated README
Merge branch 'gh-pages'
More docs update
update to refer to new management clients
[doc] Expanded documentation on app.config, documentation on app.log
remove un-used def_action methods.
default to listening on INADDR_ANY
merged in Data Channel stuff from main draft
merged in Data Channel stuff from master brnach
fixed the fonts in chrome
Merge branch 'master' of github.com:fluffy/webrtc-w3c
added simple flow diag
Merge branch 'master' of github.com:fluffy/webrtc-w3c
update media hacks highlight
Final changes in 22-pygame lecture
Added a Scene Graph file.

[ADD]: Added an outdated version of the Scene Graph file just for test
purposes.
Multiple additions.

[ADD]: Full implementation of the LSFException class.

[ADD]: LSF loading demo.
Updated the parser and atomic type aliases.

[ADD]: LSFParser::checkNode(tinyxml2::XMLNode *, const char *) const; will
check if a given node is valid and has the expected value.

[ADD]: The parser loads and checks the following tags: lsf, globals.

[FIX]: Renamed the aliases for the atomic types. Updated all the
dependencies.
Updated the .LSF file to a more recent version.
Updated the parser and mapping interface.

[ADD]: The parser now loads the children tags from the <globals> tag.

[ADD]: Implemented the ctor of the GlobalsBlock class.
Updated the parser and mapping implementations.

[ADD]: Implemented both the ctor and dtor of the LSFBlock class.

[ADD]: Implemented the LSFBlock::setGlobalsBlock method.

[ADD]: The parser now completly loads and stores the <globals> tag.
Improve migration
Reduce amount of saved data
Small fixes to the inplaceEditor
SPP-976: removed obsolete attributes for both has many attributes
added read_only switch for has_many relation between ids_collection and attribute
added status handling to get_many
SPP-976: cached result of belongs_to method in belongs_tos hash
added scopes for has_many
Merge branch 'feature/SPP-976' into develop
some minor updates to the tests... trying to understand these last 2
Clean up derivTest example. Nice speye / kron pattern
working forwardOpTest
test vect forward simulation code vs loop
scan in parallel, parallel in search (small changes)
Commented out some debugging code.
index styles started
aktualiesert datenbank
Merge branch 'master' of github.com:freegroup/verside

Conflicts:
	application/config/db/verside.sqlite
Supporting individual directives in CacheControl header
Merge branch 'master' into feature/http-header-cachecontrol-directives
Using a tokenizer to parse cache control headers
Using state machine to parse Cache Control header
Cookies are already set in the setServer call on line 39
ZF-10871: uninitialized variables when socket functions are disabled by php config
[zen-27] Renamed interfaces in Zend\Validator
fixed AbstractHelper in Zend\View\Helper\Navigation
[zen-27] Renamed interfaces in Zend\View
[zen-27] Renamed interfaces in Zend\Mvc
[zen-27] Renamed interfaces in Zend\EventManager
[zen-27] Renamed interfaces in Zend\Stdlib
[zen-27] Renamed interfaces in Zend\Stdlib, added missing pipelines (|) between params in documentation, fixed exceptions in stdlib
[zen-27] Renamed interfaces in Zend\View, removed @uses annotations
[zen-27] Renamed interfaces in Zend\Stdlib, refactored: use Zend\Stdlib\DispatchableInterface => use Zend\Stdlib\DispatchableInterface as Dispatchable, Zend\Stdlib\RequestInterface => Zend\Stdlib\RequestInterface as Request, ...
[zen-27] Renamed interfaces in Zend\Dom, fixed use statements and phpdoc
[zen-27] Renamed interfaces in Zend\Cloud
Deleted exception
Reworked QueryAdapter to QueryAdapterInterface
[zen-27] Renamed interfaces in Zend\Session
Formulario Datos 1
fixed bug where spitting crates out would cause frogatto to ride the crates
Added a hook to let spat objects respond to an event when being grabbed, and put it to use making a custom response on one of the liberated crevice-village houses.
Gave the spear kitty a new whoosh sound, thanks to ActionJack.
Changes to the animation creator as part of the object creator.
Merge branch 'master' of github.com:frogatto/frogatto
Added serialization of the hex map data into the level file.
only show corresponding item when selecting
Made debugging configurable when initializing the service.
Ignore Python dist folder.
Minor cleanups.
Bumped version number.
glorious funtoo updates

merged:

  gentoo: 70e0e0fb70629413fad8be3cbba00e9fd0ade0c0
  funtoo-overlay: 23b96635c36539ccc9d0d5e9b821c99a80245f41
  foo-overlay: 456b688c3863d3f6862ad065b3200ec5c66e1814
  bar-overlay: fb087c5a693ccc4195a2b824a60290a724802b2c
  flora: f3db00814ab95790a6bdce929a1ef4a7b7de1160
glorious funtoo updates

merged:

  funtoo-overlay: 745a47ecb4328bd5e113eb6b9830f4664747cff7
  foo-overlay: 6352fff301381ac370472ff0c01274fa55ffc0bb
  bar-overlay: 78a0865873ba50e93705d46779fd9344e60a9af3
  flora: 54007d4201901cef58316a4a99e42c5f650a36fa
  mythtv: d5133545c1814f01e74fe9079ba83d3cd21140f4
Fixed border for all other non-ff browsers
Setting title for box to reflect cluster and node being displayed
fixing silly extra tab
Added AndrweDisagrees theme.
Merge pull request #686 from gaohoward/Branch_2_2_AS7

HORNETQ-1091 :  HornetQ Rest PushConsumer doesn't acknowledge a message ...
https://issues.jboss.org/browse/HORNETQ-1080 - fixing moveMessages
Merge pull request #694 from clebertsuconic/Branch_2_2_AS7

https://issues.jboss.org/browse/HORNETQ-1080 - fixing moveMessages
changed to thin webserver
OMAP4 SD card driver

The new SD card driver at 'os/src/drivers/sd_card/omap4' allows the use
of an SD card with the Pandaboard as block service. Currently, the
driver is using PIO, no DMA, and no IRQs. The driver can be tested using
the 'os/run/sd_card.run' script.
Replace old test/block with test/ahci

The block test at test/ahci is indeed not AHCI-specific. It is a generic
block read/write test for the block-session interface. But in contrast
to the original test/block, it restores the block device content (at
least when the test succeeds). Hence, we remove the original (dangerous)
block test and always use code of test/ahci.
Vertex[inequality] part 3

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@18798 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
#2460 and other trace to spreadsheet tidying

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@18800 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
fix CopyFreeObject for lists

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@18802 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
Sign fix for TriangleCurve

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@18803 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
Implementing general case for line and circle intersection (works in many cases, but not always)

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@17850 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
Better fix for the problem in ticket #2258

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@17851 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
Tests for line/circle intersection


git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@17852 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
new command ZProportionTest

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@19548 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
Put cos^2^(x) back

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@17595 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
Trying to add support for shortcut for perpendicular for Botana's method (proof of concept)

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@17596 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
fix for #2234 (web: Input Box not working any more)

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@18029 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
ASSIGNED - # 1044: Intersection point: Special Case Handling 
https://dev.geogebra.org/trac/ticket/1044

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@18030 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
[Python] Implemented a variety of dialog windows

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@18031 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
reimplemented pinch2zoom (more direct approach needed, zoomer needs distance as input!)

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@22188 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
fix to work with new db
Ignore some files when saving all buffers
improved tiff writing params
Merge pull request #75 from simboss/geotiff

improved tiff writing params
Completed loading MM as a separate process
Slightly more flexible use of jumper patterns.
update gems and fix tests
remove tests dir
more tests and test test it on travis
fixed spec coma
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Added font for head panel. Major restyle for header
Fixed --continue and removes the lookup_id.txt file after renaming to prevent renaming renamed files. Also added checks so many error message stop appearing if the read IDs can't get renamed
Merge branch 'devel' of https://github.com/gjospin/PhyloSift into devel
adding taxonomic group names to internal nodes in jplace trees
merging some formatting changes, small refactor to create function for reading taxonmap
Conflicts:
	lib/Phylosift/Summarize.pm
fixing broken watch method in package.coffee
nfs/nlm: statedump of locks

This change allows statedump of nlm locks
giving number of clients, number of locks
each client holds and the files on which lock(s)
is/are held.

Change-Id: I6341c12ec58005ef71b93b316b527e610ff7ee8f
BUG: 824804
Signed-off-by: Rajesh Amaravathi <rajesh@redhat.com>
Reviewed-on: http://review.gluster.com/3432
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@redhat.com>
add spoken/written distinction and de-dupe javascript code
add link to praeposition page
a little more hover-fun
fix: handle compilation of multiple files in command line
code beautifying when building symbol table
also check imported Turing machines when checking references
Refactored to reflect new project name: notario. Notable taken at pypi.
Bump version.
PARK VERSION1
2012/12/5
2012/12/5
2012/12/5
2012/12/5
2012/12/5
Merge branch 'master' of https://github.com/gongxiaodong/park.git
Add some config files to track
Added 404 (perfect work :D), and autocompilation of script.js using script-coffee
define VOI
small css changes to navbar, other changes i didnt make
Displaying reason for quit
Not printing URL to screen.
Separate out slow features

Add a slow tag for the site scraper features
Merge pull request #55 from grayru/master

Лови еще немного ссылок
today
today
ugly but наглый hack
typo fix
Merge pull request #56 from rukeba/patch-1

typo fix
fix tag
today
add preliminary stars support
очепятки
Merge pull request #58 from shtirlizz/master

очепятки
Made 3 the size of the array to expect when passing an array to triangle vector drawing methods. Added a texture drawing method that accepts 6 Vec2f params, 3 for triangle pos, 3 for texture coord.
Made the Vec2f arrays in draw triangle functions const
Fixed the header file for the gl triangle draws.
Made sure the triangle draw functions were working.
fixed soem merge conflicts.
still fixing some weird merge stuff.
OK, things are fixed.
jar datei in gitignore zulassen
HIVE-3385 : fixing 0.23 test build (Sushanth Sowmyan via Ashutosh Chauhan)

git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1373680 13f79535-47bb-0310-9956-ffa450edef68
Few more steps for parser.
mp game working
add heroku alias
add noglob to rake command line
fixing css thing
Merge branch 'master' of github.com:guardian/frontend
Further config for actors in test app
Annotations: added setters for various properties on Annotation nodes.
Annotations: couple minor changes
OverlayDecorator: refactored to accept multiple techniques; moved the original functionality into the new DrapingTechnique.
Added ClampingTechnique and ClampableNode.
ClampingTechnique: applied a maximum clamp offset to prevent distance objects from clamping to the front.
CLampingTechnique: working nicely--need to tweak the min/max offsets/ranges based on various scenarios.
Added OverlayNode as a base class for ClampableNode and DrapeableNode.
ClampableNode: add depth offset settings and AUTO-do calculation.
ClampingTechnique: xome cleanup
Testing renderbin clamping.
temp
add ClampingBinTechnique
Merge branch 'master' into topic-gpu-clamping
Created DepthOffsetOptions (a serializable object), added that to ClampableNode and to the RenderSymbol.
AltitudeSymbol: doc update
AnnotationUtils: added mipmap mininification filtering to PlaceNode and TrackNode icons; also added a Style-based constructor to the TrackNode.
OcclusionCullingCallback: optimize by setting LIMIT_ONE on the intersector
FeatureModelGraph: add support for a top-level maxrange override on non-tiled datasets...
CullNodeByEllipsoid: added (still in progress tho)
Merge branch 'master' into topic-gpu-clamping
Updating readme for testing description
Support NLog layout renderers in the topic field
semver and build fixes
Merge remote-tracking branch 'nslowes/master' into develop
inc minor because layouts can be used for routing topic
Released version v0.6.0
Create basic heirarchy and templates
Makefile setup for building the blink example code here
Function replace renamed to choose plus some comments added/fixed.
Fixed import with FIXME
Increment css version
Joulusaippuaa
tout implémenté sauf optionnel
manque refactoring + daily status report
Migrate XML accept headers to JSON.
Drop XML support Fixes #36.
Added ScifioPrintable Class

Split out the toString override in AbstractMetadata to its own class:
ScifioPrintable. This class can be extended to automatically override
the toString method in a way that will ensure all fields of the
extending class are printed.

Furthermore, any field that extends ScifioPrintable will also be
explored and recursively have its fields printed.

APNG was a motivating example for this change: by modifying APNGChunk to
extend ScifioPrintable, all the APNG chunks and their metadata will be
printed along with the core APNGMetadata object.
Changed WORKAROUND tag
Switched back to JavaFX 2.1
fixed css a little bit
added password change, can't delete own account
halp
Adding information about command line usage
Chipmunk is set up in game layer

next steps: collisions, menu, tutorial
joining naubs is possible trough collisions

minimum force required
minor callibrations

still buggy:
  sometimes naubs joined throu joints but not through joins
  sometimes naubs just disappear
  investigate!
Fixup of cmd line option parsing in aviary contrib py tools
allow upload of well primer band status
1.remove some useless variables 2.move some code from deploy.py to rcs.py and schema.py
Conditional Received status added
setAsReceived route configyred
Minor changes made
Merge branch 'peiyi'
toolbar fixes
Fixed variable name in the synopsis script, improved its formatting
foot
foot
ss
add requirements file, alter some settings
2 new tabs, improved lucene
finally it's superclose to my sublime text 2 look n feel, the right tomorrow theme is at https://github.com/chriskempson/tomorrow-theme
Change polygon_collision_detection to use faux optionals

Optionals are more semantic for its purpose than the
pair<bool, rational>, but they were a tad slower, so I made a
faux_optional<> with the same interface as boost::optional<>
that is as fast as pair<bool, rational> in this case
(with this optimizer - GCC 4.7 -O3).

(This speed kinda makes sense in that boost::optional<> has to obscure
its value storage memory to the compiler a bit - have it be a
different type - so that that value can be non-constructed sometimes.
non_normalized_rational is just a boring pair of integers that costs
nothing to construct, so boost::optional doesn't save that cost as
it might with another member type.)
detector iteration: require typedef cost_type & allow more return types

Now anything with *t and bool(t) is allowed as a return type from
cost() and min_cost(), not just boost::optional<T>.
Plain T return values still work too (and might even be a bit faster,
and convertible-to-T types might now work more reliably too).

beam_contact_first_finder takes advantage in order to pass on
a faux_rational directly as its result.
improve logic a bit (affects efficiency/style only)

(either a tad more efficient, or no effect)
Document borrowed_bitset
add bbox_collision_detector.filter()

for fast, unsorted, custom-shaped areas
8-9-12 yaniv fixes  s2
8-9-12 yaniv fixes  p
8-15-12 ilan enhacements  s2
Push Base
BASE pull orig project
09-23-12
Formatting index.html. Cleaned unnecessary comment.
Node currenty edited is selected
Merge pull request #14 from lyuden/master

Edited node selected.
fix bug at SettingActivity
Fix last character being chopped off in motd/rules
Merge pull request #192 from attilamolnar/insp12+chopfix

[1.2] Fix last character being chopped off in motd/rules
Remove TAXONOMY from opers.conf.example, it doesn't exist in 2.0
Fixes #369 reported by @DjGolia
Merge remote branch 'origin/master'
Merge remote branch 'origin-ipa320/master' into automerge
AUI-640 - Deprecate AUI Dialog
AUI-640 - Refactor AUI Dialog
AUI-640 - Build files
refactor db scheme, add masterkey to tkey and tkey2object relation table
Set image path: pass lint
Export social keys to settings
Adds logos images used in external providers
Merge branch 'develop' of github.com:it3s/mootiro-maps into develop
removed redundant directories which are now located elsewhere (including different repos)
Revert "Revert "First upload""

This reverts commit 3514349c61ee7f2702f59af379f72e48593d963b.
Revert "Revert "Revert "First upload"""

This reverts commit 9c49a47d180a8174a4379c4f0fc9560100c666e3.
Revert "Revert "Revert "Revert "First upload""""

This reverts commit 2d7d9f1b576bd340448979435b3c922ddbe5a2b8.
added ReadTable Module
Added Read Table Moduel
it reads Music OutputFiles and adds the data to the datastream
added missing line city.addData
first comit
changed a label name and removed file loading at opening
added secondary read table
array bug fix
minor changes at gui apperance
merge
ffff
Merge branch 'master' into feature-3

Conflicts:
	helloCopy.html
Merge pull request #5 from ivanleblanc/feature-3

ffff
git things for bashrc and new prompt
Merge branch 'master' of https://github.com/j3parker/dotfiles
Fixes object issue when isntalling modules
Ascii art intro

intro file stored to data/intro

  ______         _                      _
 (_) |          | |                    | |
     |    __,   | |   _    ,      __   | |
   _ |   /  |   |/   |/   / \_   /  \_ |/
  (_/    \_/|_/ |__/ |__/  \/    \__/  |__/
                                       |\
                                       |/
 ____                    ____
|  _ \  ___  ___ _ __   |  _ \ _   _ _ __   __ _  ___  ___  _ __  ___
| | | |/ _ \/ _ \ '_ \  | | | | | | | '_ \ / _` |/ _ \/ _ \| '_ \/ __|
| |_| |  __/  __/ |_) | | |_| | |_| | | | | (_| |  __/ (_) | | | \__ \
|____/ \___|\___| .__/  |____/ \__,_|_| |_|\__, |\___|\___/|_| |_|___/
                |_|                        |___/
Ajuste no formato de Campos de valores
Added a section informing the user that the file needs to be executable in order for the pre-commit hook to work properly.
Prepend "/refs/" in Repository.get_git_ref (issue #102)
Fix test when run on Linux with source tree on case-insensitive filesystem
Implement optional revert of #102 (issue #104)
pep8...
Prepare v1.8.1
Merge branch 'develop'
Publish version 1.8.1
sleep deprived cluster fuck, will fix later, this is just for syncing
no idea what I'm doing, probably about to break something
Version bump, documentation updates
Add argparse to python debian
Merge branch 'debian-updates' into debian-updates-with-infrastructure-debs
Set parameter values back to sensible numbers, and regenerated the test results on the 10\% dataset
updated a lot of naming and front end
new file:   Ostoskori.java
	new file:   KirjanpitoImpl.java
	new file:   Kirjanpito.java
	new file:   PankkiImpl.java
	deleted:    PankkiImpl.java
	modified:   Tuote.java
	new file:   Kauppa.java
	new file:   Main.java
Revert "	modified:   Tuote.java"

This reverts commit 8a17dd92978f0e4c9c2452d6b401590be04f51bf.

	modified:   Tuote.java
Updated Doc-comments in Menu gadget.
Merge pull request #2 from freedomdeveloper/master

[Menu]: Doc-Comments Updated
[Users]: Added "about user" layout action only for superadmins
Some clean up and some documentation.
Added equals and hashcode to texture
Some basic improvements to some miscellaneous high level game logic
Added some more documentation. Can't think with all this TURKEY IN MAH BELLEH
Starting work on Entity Engine.
Made some small miscellaneous changes in other places.
theme keeps changing, odd
Squashed '.vim/bundle/vim-plantuml-syntax/' content from commit a6341a4

git-subtree-dir: .vim/bundle/vim-plantuml-syntax
git-subtree-split: a6341a419e9ac3ce5688401e2e99976ec9cacc4d
Merge commit 'e8fae86f2603bcd96e2cb9ff71bf37303b93be78' as '.vim/bundle/vim-plantuml-syntax'
added plantuml-syntax.vim
mopping up prints agaim
actually pass owner to [C]RAR.open
reduce [C]RAR constructor visibility
screwy readme
Updated style of h4 in admin UI
Page View Loading Issues

Fixes issues where Page View woudnt load
Remove Catalog column from Pools tables

It's useless to have Catalog link in pool row, since any Pool can have
multiple Catalogs which are not displayed.

Increased spacing for Pool name in Environment's table.
add 'S' shortcut key for selecting for mass deletion
up version num
update version number for dashboard tweaks keyboard shortcuts
Revert "update version number for dashboard tweaks keyboard shortcuts"

This reverts commit cb56f17db853f7660823612927d1e2b401c7385c.
Adding files

Adding files (I guess they're missing)
更多的容错机制
Update GPL to Version 3
Added Eclipse Project Files to .gitignore

Eclipse creates .project, .buildpath, and .settings in project directory.
Added these to the .gitignore.
Update to the bootstrip example on the current _v3

small change to reflect how to deal with things for large count
domain/subdomain setups.
Add functionality to search filter declarations to easily find where a filter is applied in the codebase. Somewhat.
Began implementation (at this point, just subclassing) of FileDiffCode{Added,Changed} in JRuby.
Initial import of python code to access Fitbit data.
changed notion of 'callgraph' feature to a more correct 'callee data' feature
updated penguin animation, grass edge tiles, new release builds
Merge branch 'master' of https://github.com/jfred1979/badball
Fixed heading hold limit param.
Remove duplicate implementaion of function CCFileUtls::getResourceDirectory for IOS after auto merge
update DateHelper ,DBUtils
Support reloading.
Updating 3_0 submodule with latest changes (tab removals).
notes: add attachment upload and show
change event binding method names
Make improvement
Candy Candy
Merge branch 'master' of github.com:jixiuf/emacs_conf
merge
Conflicts:
	site-lisp/helm
	site-lisp/joseph/joseph-helm.el
	site-lisp/lisp/joseph-loaddefs.el
popwin:special-display-config
popwin:special-display-config
added AM05 reference
it's not so easy
Added rails 3 engine
Replaced class_inheritable_hash with class_attribute for rails 3.2
Changed named_scope to simply scope for rails 3.2
Merge branch 'master' of https://github.com/garytaylor/preferences
add the official Go plugins from 1.03 release
Line separators
Rating Places take #2
mac80211: do not delete linux/*_platform.h, they are touched by patches. instead make the build fail if they differ from the ones in the kernel tree to prevent subtle runtime issues (see #11981)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33030 3c298f89-4303-0410-b956-a3cf2f4a3e73
mac80211: allow scans in access point mode (for site survey)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33613 3c298f89-4303-0410-b956-a3cf2f4a3e73
Started implementing the Building Manager, loading not done yet
More vim configuration...
parser for XML-UI implementation, implementation of JSP-UI improved
validate email addresses, don't raise delivery errors
show errors if something goes wrong, fix test
add new relic
Update git.txt

added remote prune
Unbreak MongoMapper (87 failures). I translated the code wrong in 84bd0e118.
adding license closing issue #2
Add lein-cljsbuild to project (instead of .lein)
Set correct base iri
Make Travis run 'cabal update'
Readme: development note.
Merge branch 'master' of github.com:joeyespo/gitpress
Adding some files I have been changing.
modified css for up and down vote
Moved repo to rotten.bastard.local
	modified:   systemcfg/files/default/local.repo
incremented ver in readme
indentation of swallow example
targeting correct jvm
test: reserve_basic: mem leak cleanup
Merge pull request #18 from jongrimm/master

Thanks. Great stuff!
SCSI: READTOC change alloclen to a uint32 and encode it in the CDB
TEST: try to make 0410 nicer

0410 is the first test for the MMC commandset.
This commandset is in hindsight a bit more complex than other commandsets
in that we have to handle quite a lot of cases :
1, if it is not a MMC device, we should check we get INVALID_OPCODE and then
bail.
Then if it is a MMC device, there are at least three different cases we have to
handle:
2.a  If there is no medium in the device
2.b there is media, but the medium is blank
2.c there is readable medium

this makes MMC tests a lot more complex than other commandsets
so we have to try to get this one as nice and simple as possible so we can
reuse this test as the framework when adding other MMC tests.

(even the 2.b test is not 100% right,   since if the medium is BR, then a blank disk will fail with sense,  but blank pre-BD mediums will not fail the READTOC command)
Merge pull request #20 from jongrimm/master

 RESERVE6/RELEASE6 Commands + testcase.
TEST: 0420  some cosmetic printf changes
TEST 0420  cosmetic printf change
test: Add test to release from second initiator when already reserved by first initiator.
TESTS: Add 'initiator2' variable so we can run tests with two different initiatir names

Update the 0420 test to use different initiator names for the two sessions to the target.
TESTS: Add externs for the two initiator names
TEST: Add readme for the test tool
TESTS: Add two tests that RESERVE6 is dropped on LUN-reset as well as session logout
Fix merge conflicts
Renamed everything to PhonyRails.
Added documenation, README.homework

Signed-off-by: Joseph Lee <josephl@cs.pdx.edu>
Version 0.3: Removed 'smart_notification' and away_notification' settings in favor of more granular notification settings
Monitron rdfizer is ready to test
Add unit tests for the example programs
поправили баг с заходом в песню
Missing map entry for Ryumin-Light. Added
Conver to use textproc/json-c.
Remove json-c.
Remove json-c
Added buildlink3 file for easier dependencies.
Made fam non-optional instead of a standard option.
Rev for 2.0.6
Add feedback connection setup files (direct vs. I2C) and some new motion sensor/IMU code
Add DOM test
More Peach Turnips WIP
added fix for issue https://github.com/rhuss/jolokia/issues/52 so that property names can be returned in raw format (instead of canonical) using a new ConfigKey.   MBEAN_CANONICAL_PROPERTIES or using the REST query parameter "canonicalProperties" with value false (its enabled by default to preserve current behaviour)
Merge convertFPToNRGBA64_row and convertFPToRGBA64_row
Refactoring and renaming
Cleanup documentation
Rename things
Add "bspline" filter to example utility
Refactoring
Cleanup
#POULPE-268 refactoring. Move zcript to another file. Added comments to scripts
#POULPE-245
* Corrected compile errors connected to type casting
Fixed:  Validation error message (in red): "This field may not be empty or contain only spaces" is shown before closing the window
Trying pdflatex again
Removed sensitive contents from settings file. Added a requirement for a "localsettings.py" file which isn't version controlled. Put your sensitive settings in here.
It's a start
Lets Go
Shorten Chance of Precipitation to POP
reduce page height
Fix for building in older OSX versions.
Fix read/write functions
Merge pull request #2 from tmm1/patch-1

Fix read/write functions
Set values for TWILIO_ACCOUNT_SID and TWILIO_AUTH_TOKEN in the test environment file
Ignore rbenv files
Ensure the moon phase is dark to properly run the test
Rename the output file names
clean up the code
Refactor the UI according to Andrew's suggestion
Add --purge and --no-act to kpa-backup.sh
Cat facts grammar tweaks
[spec/requests] Remove some sleeps
[spec/requests] Fix some specs
notifications skeleton
added pitchGuide asm
Merge branch 'master' of https://github.com/karldprice/M_Dsgn
Correct textdomain
fix day overlap check for multiple days
enforce acronym validation and loosen the check
updating the pentabarf import rake target
enable nginx config options
pentabarf import: importing people
pentabarf import: importing accounts
introduce non-public event attachments

Private attachments are used to show slides to the conference team,
without the files ending up in a public schedule.
pentabarf import: importing events and more
fix pentabarf import problem with long subtitles
fix typo
conference listing page, realized with strange route hacks
Add dependency 'twitter4j'
minimize delayed destruction
add task module.
update READEME.md.
update license files.
Random Topic Generator fully functional
no more folding -- I can do my own laundry!
GRAILS-8296 and GRAILS-5520 docs for column and table comment, and column default value
GRAILS-9473 - clarify bindable as it relates to bindData
Merge branch '2.1.x' into 2.2.x
Complete All ecWeb
Installed devise, along with devise views
fix format tausend seperator access
changes withot sorting files

only compile, not tested version
Added MyLists functionality.
fixed the player store that had been broken for awhile
set health to fill up after each wave
fixed store to update prices after each purchase
updated readme, some refactoring, added selenium code execution
fix the mailer, right align image credit
and htis one
Update gitignore, try to make dirserver reuse
Add Dojo 1.7.2 and update to latest version
Bump version 0.5.5
Hooks added for new Config.class
additional surroundings
add impress slides
rebase dev
Long polling: React to closing of the RESPONSE connection.

Not the request. (If client calls shutdown(SHUT_WR), keep the connection open.)
add some specs for random slot
fix bug Slot#name when no product in the slot
change Slot#name return 'お楽しみ' when slot is empty
implement purchase random item feature
Merge branch 'random_feature'

* random_feature:
  implement purchase random item feature
  change Slot#name return 'お楽しみ' when slot is empty
  fix bug Slot#name when no product in the slot
  add some specs for random slot
logic
222222 
good size 
LAST IN THE CUP
6.11.12
20 06     
20 06
21 26
21 50
artwork options
launch server only when not started
READMEを変更
ポップアップを作成
added caching and mobile support
added option for nested classes
first iteration of fluid grid support
Add color conversion example in the config loader
Add PYTHONPATH setup
Rename template config to input config
Reflect the rename in doc
Add expand function
add haskel
やっぱり時刻入れたほうがいい
Merge branch 'master' of https://github.com/kshimo69/dotfiles
Draft alcoholic behaiviour is added
Made sbt test work
Revert "ai"

This reverts commit 25f22e17adf413514a768de9f407a3b22b79d2d4.
Poprawka #1 SpriteConfig
modify FirstStage elevatorMechanism setting
Update Begin scene about Gear
fixed sprite draw depth
fixed shadow size
Drew level 1
initial commit
upstream
WP7: Code beautifications.
如何更新 apt-get 源？
#36	Article comments feature was added
Added Jquery and annoyed the white space of readme
Merge pull request #1 from ninjapanzer/master

I added Jquery
icon drapeau anglais
icon drapeau français
fichier de gestiond de la langue
Ajout du css pour les petits drapeaux de choix de langue
modification des include ( phtml )
ajout du formulaire pour le choix de langue
Modification constructeur ( langue )
Modification constructeur ( langue )
Ajout de la prise en compte de la langue
Class Actualite (Il manque la méthode update)
Class Members(Il manque la méthode update)
Ajout des description des nouvelles tables
Liste des dernières modifications
base à jour avec les nouvelles tables
Add nightlies for my OpenIndiana server
Replaced homegrown Unmodifiable list with Commons version.
Merge branch 'test'
Add introducion information
updated algorithm for estimate rtt
Sprites
Merge branch 'master' of https://github.com/lching/Gunblaster
add email config to production.rb
add plist for use with launchd
Inline representation of feature sets admin page
removed the feature of a self updating second field in the range filter. It was a hack. There will be a special one field integer for this
修改注释风格，增加APP::authcode()加密解密函数
增加对多服务端的支持
Update perforce-proxy and perforce-server to 2012.1
added frontend - ejbs are somehow not working in JBoss7.1.1
MOAR TESTS

Yes, I just spent like an hour adding tests to my few solutions

SHAVING YAKS BABY!!
Initial mp3 url support
Fix resulthint saving
Initial attempt at resulthint checker
Compile without warnings on mingw64

This is mostly a matter of catching cases where we were still
assuming that evutil_socket_t could be used as an int.
Fix compilation on mingw64 with -DUSE_DEBUG
Move __delay function into assembly to get accurate BogoMips
Merge remote-tracking branch 'upstream/rpi-3.2.27' into rpi-3.2.27
git init
README
fix some maven pom error
README
使用 -dm 取代 -pm
更新翻译
Minor vimrc tweak.
Tweak for playtest
add ch19/ch19_netpyoung.lisp
Merge branch 'master' of github.com:lisp-korea/onlisp
adbanner added
[*] Agree box and Checkout button widgets refactoring.
[*] Small design changes.
Merge branch 'master-dev' into joy-refactoring-checkout-agree-box
Go 1.0, compatibility: 10 ~ 15.0a1, sorry 3.6 :(
Drop 1.9/3.6 support, part 1: overlay.
Drop 1.9/3.6 support, Part 2: nsIProcess.
Use runw() introduced on Gecko 2/Firefox 4.
Proof reading for sequence stopped at unsnoc for finger tree
fix for featured promotions
Merge branch 'beta'
search
Merge branch 'master' of https://github.com/liveitchina/sites.git
Merge branch 'beta'
update
update 
Merge remote-tracking branch 'origin/master' into dev

Conflicts:
	themes/omega-liveitchina/css/global.css
	themes/omega-liveitchina/template.php
missing ;
missing ;
update
Merge branch 'beta'
Merge branch 'dev'
[Delivers #35752399]
remove unnecesary grid class
Commit changes to add cost on featured tutor.
Merge remote-tracking branch 'origin/dev'
Commit when an anonymous user clicks the bookmark it should ask him to
log in FOR SCHOOL.
Ticket #714 - Help - missing rules, links
add index debug
Assume SHA1 for default_md if key is missing from opensslcnf
Remove the group from -fhonor_infinites/-fno_honor_infinites aliases.  Aliases
with groups are unsupported.
rdar://11324283


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@155637 91177308-0d34-0410-b5e6-96231b3b80d8
objc-arc: When objects with known CF semantics are assigned to
retainable types in arc, only suggest CFBridgingRelease/
CFBridgingRetain and not the confusing __bridge casts.
// rdar://11923822


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@160839 91177308-0d34-0410-b5e6-96231b3b80d8
[analyzer] Use a stack-based local instead of a temporary to fix build.

Passing a temporary via reference parameter still requires a visible
copy constructor.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@160840 91177308-0d34-0410-b5e6-96231b3b80d8
Allow objc @() syntax for enum types.

Previously we would reject it as illegal using a value of
enum type and on ObjC++ it was illegal to use an enumerator
as well.

rdar://11454917

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@156843 91177308-0d34-0410-b5e6-96231b3b80d8
[objcmt] Rewrite [NSNumber numberWith*] messages to the new @() boxing syntax.

There are some caveats:
-If an implicit cast (e.g. int -> float for numberWithFloat:) was required, the message
 will not get rewritten
-If the message was with numberWithInteger:/numberWithUnsignedInteger:, which are very
 commonly used, be more liberal and allow the boxing syntax if the underlying type has
 same signedness and will not lose precision.

Part of rdar://11438360

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@156844 91177308-0d34-0410-b5e6-96231b3b80d8
[clang.py] Store reference to TranslationUnit in Cursor and Type

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@156846 91177308-0d34-0410-b5e6-96231b3b80d8
Add documentation about boxing enum types and a codegen test to make
sure we pick up the underlying type, per suggestion by Fariborz.

No functionality change.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@156851 91177308-0d34-0410-b5e6-96231b3b80d8