labofsahil/github-event-dataset-2012 huggingface dataset:
support patching an xform using google diff-match-patch format
Merge branch 'master' into patch-save
Merge pull request #395 from dimagi/patch-save

Patch save for vellum
delete old pre 1.0 domain backend
Merge branch 'master' into delete-code

Conflicts:
	corehq/apps/domain/views.py
oops; bad merge
small cleanup
Merge pull request #338 from dimagi/delete-code

Delete code
selenium wrapper api change
Merge pull request #354 from dimagi/mwhite

selenium wrapper api change
waybill activation and it's spec
Add darken-text recipe.

Signed-off-by: Sébastien Gross <seb•ɑƬ•chezwam•ɖɵʈ•org>
Merge pull request #950 from renard/darken-text

Add darken-text recipe.
apply security handling
apply standard ui style
Graupner HoTT V4 Telemetry library.
Graupner HoTT V4 Telemetry configuration and setup in main loop.
first connit
second connit
Add link to JavaFX Third Party Tools
Damage and absorb are allowed on any item type
fix segfault when right clicking a quest item

Quest items should be explicitly handled (AKA ignored) when the player
"activates" them in their inventory.
Merge pull request #843 from jamer/seg-fix

fix segfault when right clicking a quest item
Remove hackish getSlotIndex(). Use proper code instead.
Fix copy-pasta
Fix minecart hotspots in cave1.txt
Check all lines when comparing menu tooltips
Merge pull request #844 from igorko/master

Allow to equip any new added slots by right-click
Merge pull request #845 from dorkster/bugfixes

Fix minecart hotspots in cave1.txt
Merge pull request #846 from dorkster/tooltip

Check all lines when comparing menu tooltips
Merge pull request #556 from dorkster/menu

Simplify HP/MP menu config
Remove hard coded positions from HP/MP menu
[clang.py] Add CachedProperty decorator

It isn't used anywhere yet.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@162190 91177308-0d34-0410-b5e6-96231b3b80d8
[cindex.py] Add CachedProperty to CompletionChunk

Suggested by:  Francisco Lopes  <oblita@gmail.com>

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@162191 91177308-0d34-0410-b5e6-96231b3b80d8
Using rl to decode the parameter.
oprava init verze
Now allows low level bans of IP's and usernames
Fixed broken center-vertex, increased SPRING_CONSTANT in SpringLayout to prevent large trees and paths to fly to far away
Added modules/prelude-package-autoload.el
Replaced modules/prelude-package-autoload.el with modules/prelude-load-user-packages.el.
Removed two accidentally-committed files...
Add accidentally-deleted files back into repository.
comments to aide simple copying of pkg contents
Get back old readme
Don't test on node 4
Correct for jshint
Add tests for nofreeze
Add exports for node
Test conflict
Merge branch 'master' of https://github.com/dto80/CDU_CMU2.git

Conflicts:
	src/main/java/edu/cmucdu/ecommerce/web/util/WebUtil.java
Customizing readme, and removing cakephp readme
clock:
  - add node sname to start script
bullet:
  - use random 8-byte key together with pid to identify session
  - no session encryption
  - match key in bullet_xhr_handler
updated +select mixin
Create ut_fib.txt

Unit test file for testing the fib.mkv Markov program.  It calculates the first 20 fibonacci numbers.  To run, type:
    markov -test fib.mkv ut_fib.txt
unsafe memory operations made clearer
Renamed util.testing.control.Buffer.wait => expect and added the optional 'times' parameter
support celera
Commit all modified source to local branch before merging Al Moataz/Eebs changes.
Allows rudimentary execution of Java from Javascript and vice versa.

Most functionality of back-end is deprecated in newer version in 'master' branch. This exists for GUI testing purposes only.
Remove radio buttons
garbage
Merge branch 'master' of git://github.com/Morse-Code/SorryGame.git into ben

Conflicts:
	src/sorryGame/Deck.java
	src/sorryGame/GameApplet.java
	src/sorryGame/GameBoard.java
	src/sorryGame/HardComputerPlayer.java
	src/sorryGame/Pawn.java
	src/sorryGame/PlayableSquare.java
	src/sorryGame/SorryGame.java
	web/pages/Sorry!.html
	web/pages/sorryGame.jar
Merge branch 'master' of git://github.com/Morse-Code/SorryGame.git into ben
Enlarged Pieces, Start, and Home, removed radio buttons.
Merge branch 'master' of git://github.com/Morse-Code/SorryGame.git into ben

Conflicts:
	web/pages/Sorry!.html
Enlarged Pieces, Start/Home spaces

Signed-off-by: Ben Witte <bjwitte@gmail.com>
uhg
Merge branch 'master' of git://github.com/Morse-Code/SorryGame.git into ben

Conflicts:
	web/pages/Sorry!.html
	web/pages/sorry.css
Spaces now Highlight to show you first index if it is valid.
Now highlights first index. Fixed bug.
Add php to server side for delivering web content and MySQL communication

- bunch of php made by Ben to implement MySQL and login page.

Signed-off-by: Christopher Morse <dignanmorse@gmail.com>
Changes to player classes to facilitate rudimentary game play

- player classes require color parameter string.
- Changes to EasyPlayer to simulate movement and gameplay.
- Changes needed to fix game logistics, but mechanics working correctly.

Signed-off-by: Christopher Morse <dignanmorse@gmail.com>
Add methods to initialize computer player and call computer player to take turn.

Signed-off-by: Christopher Morse <dignanmorse@gmail.com>
Fix string comparison in from "==" to "equals()".

Signed-off-by: Christopher Morse <dignanmorse@gmail.com>
Add for Pawn starting position in the main game board array.

- startIndex added to reference the position of entrance to the main game board array, dependent upon Pawn color.

Signed-off-by: Christopher Morse <dignanmorse@gmail.com>
Set location field of Pawn after a move.

- allows Player class to query Pawn for location information used in AI movement decisions.

Signed-off-by: Christopher Morse <dignanmorse@gmail.com>
Fix start position id's to match actual position id's of GameBoard.

Signed-off-by: Christopher Morse <dignanmorse@gmail.com>
Added Search and Browse (neither functioning yet. js moved to scratch for now) to index. Added more comments to css and main.js
i hate that damn thing
Updated README: Option -d shows detected flash layout
Web banner
ran powershell to update and enable migrations

pm> Install-Package EntityFramework -IncludePrerelease
pm> Enable-migrations

http://stackoverflow.com/questions/10411529/package-manager-console-enable-migrations-commandnotfoundexception-only-in-a-spe
[testdist] Fixed wrong implementation fo TestServerStateMachine
improve diamond sponsors for hidpi and include alt text
Saved profile added, to fix broken tests
Removed Usage:
Added &incf and &decf.
Moved the about page outside activities
making the back acceptance spec pass
Update lib/project_razor/model/debian/wheezy/preseed.erb
Add attendee row for AddingEvent, Add DetailWindow/MapWindow

- add fake line for notification table
Cropping extra whitespace
Use pkg/syscall constant for IOCGWINSZ
Add input switch: adb (default) / stdin / file with support for 'adb logcat' format and pusslog format (adb logcat -v threadtime does not work yet
Refactor methods to different files and other small refactoring changes
Fix REGEXP_ADB_THREADTIME regexp, thus supporting 'adb logcat -v threadtime' log format as input
Fix -input description
Added a config line "max-undo-steps" for the undo depth. This may be zero.
It defaults to 10240, same as before.
Merge branch 'zarfwork' into iosglk
move java import manipulation to the server side
beginning to translate svg images into elisp
new library
simple sketch to check GSM board is working
notes
Quick workaround that enables deserialization of Post objects that were serialised to JSON by the DefaultJsonMapper.
Fix IDT copy
Mailto: will now still be picked up if it's not lowerased.
Marked 1.8.0 version
COMMONS-121 - GIT migration: new master pom versions 4.0.0-SNAPSHOT for PLF4.x
Modificado RolHome para adaptarse a los nuevos metodos
been working on this all day what a waste of time
various tweaks today just trying to make it all work
end of the day
removed test, largely pointless test too. and it was breaking the build.
trying to fix this up
debug settings
all now passing
Upgraded devise
Perlito5 - javascript: fix optimization of hash literal
Support console instead of print, which can fire the print window in Chrome...
Fix Command to support stderr in xml
Add hard coded healing surge power.
Added a test to ensure that the next song isn't played, when changing the playlist while a song is playing
debug zoomIn
Make the .desktop file translatable
html files
New layout
blog e gallery
Item11808: perltidy them all, so people are not accidentally impacted by the new enforced rule -- Sorry Micha, could not find a way to define specific values within the file

git-svn-id: http://svn.foswiki.org/trunk/ImgTag@14686 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
seeking for the bug ... not found yet for 2D nurbs
Remove 'Prereq: service' in spec file
retrait du main() de chatwindow
Let navbar + Footer
reverted changes to FAKE config, teamcity still can't find msbuild
really finalize changes to missing narratives list
Very minor adjustments and clean-up of code
More grade keeping features.

Adding new students to the chart, handling null lists, javascript
improvements.
Merge branch 'period-dhis-to-kevin' of github.com:fterrier/kevin

Conflicts:
	grails-app/controllers/org/chai/kevin/cost/CostController.groovy
	grails-app/controllers/org/chai/kevin/dashboard/DashboardController.groovy
	grails-app/controllers/org/chai/kevin/data/NormalizedDataElementController.groovy
	grails-app/controllers/org/chai/kevin/dsr/DsrController.groovy
	grails-app/controllers/org/chai/kevin/fct/FctController.groovy
	grails-app/controllers/org/chai/kevin/maps/MapsController.groovy
	grails-app/controllers/org/chai/kevin/planning/EditPlanningController.groovy
	grails-app/services/org/chai/kevin/cost/Cost.java
	grails-app/services/org/chai/kevin/cost/CostTableService.java
	grails-app/services/org/chai/kevin/cost/Explanation.java
	grails-app/services/org/chai/kevin/dashboard/DashboardService.java
	grails-app/services/org/chai/kevin/dashboard/DashboardVisitor.java
	grails-app/services/org/chai/kevin/data/Info.java
	grails-app/services/org/chai/kevin/data/InfoService.java
	grails-app/services/org/chai/kevin/dsr/DsrService.java
	grails-app/services/org/chai/kevin/fct/FctService.java
	grails-app/services/org/chai/kevin/maps/Maps.java
	grails-app/services/org/chai/kevin/value/AverageValue.java
	grails-app/services/org/chai/kevin/value/CalculationValue.java
	grails-app/services/org/chai/kevin/value/ExpressionService.java
	grails-app/taglib/org/chai/kevin/FilterTagLib.groovy
	src/java/org/chai/kevin/dashboard/DashboardProgram.java
	src/java/org/chai/kevin/data/Aggregation.java
	src/java/org/chai/kevin/data/Average.java
	src/java/org/chai/kevin/data/Calculation.java
	src/java/org/chai/kevin/data/Sum.java
	src/java/org/chai/kevin/value/CalculationPartialValue.java
	src/java/org/chai/kevin/value/DataValue.java
	test/integration/org/chai/kevin/dashboard/DashboardControllerSpec.groovy
	test/integration/org/chai/kevin/survey/SurveyDomainSpec.groovy
sync phpfog to github
初始工程创建
Started conversion to PSR-1 compatible code.
Continues the move to PSR-1.
More PSR-1 conversion.
This should be all the Kernel classes converted to PSR-1.
Fixes leftovers from pre-PSR-1
gentoo.org updates Fri Mar 16 12:04:46 MDT 2012 update
liquid koln
Fix offset error when doing munge auth

When munge cred could not be written in one go, subsequent
writes were at offset=0, triggering server to reject the autentication
attempt with the error:

diod[<pid>]: writeafid: write at unexpected offset
Tweak recovery console messages
prep for 2.6.38.5-19
return http
File renamed
Merge branch 'master' of https://github.com/gaui/jascraper
Adds and tests initial user, ride, trip, and location migrations
Merge pull request #5903 from Warpten/ringOfValor

Core/Battlegrounds: Fire lines in Ring of Valor should only be lit when the arena battle begins
Merge pull request #5933 from GyxTom/master

Core/Misc: Code style and remove unused define
Merge pull request #5649 from Elron103/pull-requests2

Core/Movement: Fix random position finding near edges, avoid big z-coordinate differences
DB/Quest: Add SAI-script for quests - thanks to Unholy and Redsonja for recreating the SQL.
Closes #1448, #3812, #4312, #385.
Core/Script: Code style and some rewriting.

JustDied(Unit* Killer) -> JustDied(Unit* killer)
JustDied(Unit* /*Killer*/) -> JustDied(Unit* /*killer*/)
JustDied(Unit* /*unit*/) -> JustDied(Unit* /*killer*/)
JustDied(Unit* /*slayer*/)) -> JustDied(Unit* /*killer*/)
JustDied(Unit* /*victim*/) -> JustDied(Unit* /*killer*/)
JustDied(Unit* victim) -> JustDied(Unit* killer)
JustDied(Unit* /*who*/) -> JustDied(Unit* /*killer*/)
JustDied(Unit* who) -> JustDied(Unit* killer)
JustDied(Unit*) -> JustDied(Unit* /*killer*/)

Signed-off-by: Gyx <2359980687@qq.com>
Core/DBLayer: Added missing prepared statement implementation for uint8/16
Core/Logging: Fix a typo in DebugLogFilters - Database & AI

Thanks to Garthog for finding it
Core/DBLayer: Delete a triplicated prepared statement (LoginDatabase)

Thanks to Anubiss for spotting it
Core/Config: Add SQLDriverQueryLogging to authserver.conf (disabled by default, just like worldserver)
Core/DBLayer: More type fixes
DB/Loot: Antechamber of Ulduar reworked
Merge pull request #5964 from GyxTom/master

Core/Misc: Code style and some rewriting
Core: Send SSL and ACE version in all logging detailmodes, not just when set in the config
Core/DBLayer: Fix another wrong type in mail related code
DB/Auth: Increase realmlist.address size to 64 (varchar)

You might want to verify if the previous size did not truncate your address (it was 15)
Core/Script: Code style and some rewriting.

MoveInLineOfSight(Unit* unit) -> MoveInLineOfSight(Unit* who)

Signed-off-by: Gyx <2359980687@qq.com>
Merge pull request #5975 from GyxTom/master

Core/Script: Code style and some rewriting. 
Database/Spawns: Spawn some missing creatures.

Closes #5974
DB/Spawns: Fix previous commit (512aa8897bf30bbb8)
Core/Spells: Fixed SPELL_GROUP_STACK_RULE_EXCLUSIVE_SAME_EFFECT on several types of spell effects
closes #5961
Signed-off-by: Subv <s.v.h21@hotmail.com>
[gc495] some tickets edit
[gc236] some Thorim wipe corrections. Not sure how should the visuals be, but the functionality is ok
fixed epsilon provider
Merge pull request #5 from matley/event-based

fixed epsilon provider
updated version and dependencies
add debian related files
README.txt file added
packager.sh script added
Added partition artifacts
Cleanup
Fixed optional methods call
Moved Setter class to util package
Added partition modeling
Renaming
Replace Collection by List in Listenable interface
Removed unused import
Job xml loader refactoring
Extra Flow changes
removeAddress
Start logic.
initial import of code - MAY NOT BE FULLY FUNCTIONAL
readme formatting
fixed error, better formatting, still don't understand how to make setup.py dependancies work
updated readme
updated readme with sync/async docs
updated setup.py long_description
use the correct install_requires field instead of requires
fix issue #1 (wups!)
fix for issue #2 (now only accepts 'production' or 'sandbox' as valid environment values)
really fix issue #1 getvalue vs getValue
new timeout variable for configuration, default is 20
made pyapns server connections timeout after the configured ``TIMEOUT``
Add our own StringIO class with context management methods
fix log messagges
fix namespace issue when feedback connections close
Add add a 15 second timeout to notify (this should be configurable in the future)
server throws a fault code 500 when connections to APNS times out
add timeout changes to README
support pylons timeout configuration
don't del timeout (not needed)
make timeout configurable
bla a quote in an error message
Remove unused OpenGistTask class
Upgrade user agent version to 1.3
User char instead of String where possible in toString()
Thread safety in config.

Such a shame I didn't worked this out earlier…
added ls 1.0 released blog post to main post list
minor spelling of composition
removed outdated examples and references to import and &func
function composition in docs
minor: fixed docs for importing own props
minor: fixed comparison table for <<<<<
updated with %% operator additions
A sketch of a Cython interface to OP2-Common

The idea is that we only ever need to pass handles to the C data
structures around.  So we wrap the creation routines and keep hold of
handles to the C pointers.  When we need to call functions from the C
runtime library, the python objects are carrying around a handle to
the C pointer and can pass things appropriately.
Expose op_plan to python

A continuation of the cython sketch interface to OP2-Common.  The
planning functionality is wrapped up in an op_plan cython class.
To access the data needed for execution from the plan, use the class
methods that correspond to the OP2-Common struct slot name.  For
example, to get the loc_map slot from an op_plan instance, do:

   array = plan.loc_map()

This returns a 1-D numpy array of the correct type whose data buffer
points to the C side's data.  That means, DO NOT CHANGE the data you
get back from these calls.

Python code is responsible for marshalling the relevant bits of plan
data to the device if necessary.

There is no python object representing a plan, so lots of the glue
code is missing.
Store Map values as int32 to match C runtime
Automatically construct C handle in python initialisers

On the python side, type._lib_handle is the handle to the C object.
To pass an object to the C core, we wrap it in a Cython library
(op_lib_core) which knows that the C object pointers are on the
_lib_handle slot.
Fix up op_plan initialisation

Hopefully this now works.
Build C level op_arg types automatically

__call__ methods on datacarriers now return an Arg type, so that
multiple calls to access the same Dat (for instance) do not modify
it.  Necessary for building the set of unique arguments to a
par_loop.  The Arg type also knows how to build an op_arg C-level
struct describing the argument.  This is not called at initialisation
time, instead, if you want the handle, you do arg.build_core_arg().
This populates the _lib_handle appropriately.  C interface plan
routine now uses this to populate arg array for passing to
op_plan_core.
Expose all op_plan data to python side

The plan structure returned by op_lib_core.op_plan now exposes the
data it contains as properties to python.  The names of these
properties are in one-to-one correspondance with the C naming.
Cython setup: read OP2_DIR from environment
Remove unused format arg from Dat __repr__
FIX: (cython-setup) include numpy header path
Pass correct size to op_decl_dat_core

The size argument is the size of a single datum, not the set size.
Call C-side op_init on backend selection
Add error checking to memory allocation
Add class .content.
Added only_end_products field.
Added link to not end products.
Added link for delete price-list.
Fixed content type.
Fixed content type.
Added page 2partners.
multiple version numbers check + compare thrones feature
Regular Expression implementation (java.util.regex)
first spec passing.  that's something
we're able to retrieve values now
ensure that values are returned as expected
spec cleanup + ensuring that we handle empty data from graphite safely
raise an exception if a metric is not found
Web now relies on Umpire::Graphite
whitespace
need to dump the value still
beginnings of a web spec + a hack to disable instrumentation during testing
move around the logging hack simply by upgrading Scrolls
spec to ensure params are passed in
more web specs
spec ensuring values are returned
checking ranges
Scrolls::Log.start no longer needs to be called
Merge pull request #6 from gorsuch/extraction

Extract graphite-specific code into its own lib ; add specs
upfitted tycho build, v0.15.0, EMF model plugins built by maven now
using remote/standard p2 repositories and target def only
reconciled dependencies within master project
updated Texo pojos and exported package
maven builds work

still have a compile problem, due to halfway through replacing jersey
with spring mvc for rest controllers
Added Team domain and tests.
Admin WIP
Basic test showing that AdminImpl works
Sanity check for channel names. Other misc. cleanup
Worker status is now being posted for paused workers
Additional work on AdminFeature (see Issue #24)
Merge AdminFeature branch into master
Disabled InfinteTest
Dependency version bumps
Reduced logging verbosity
WIP for WorkerPool example test
storing exams in memory entirely on the backend
Fix two instances of still using get_core_value()
add debugging capabilities

Debug::printf and Debug::fprintf were added, to replace
the stdio corespondents.
This allows control over when those functions are enabled
анимации в процессе имплементации
fix protocol use
Merge branch 'dvp-sslproto' of github.com:grwl/sslcaudit into dvp-sslproto
Ping the owner when informing
Fixing tabs vs spaces in makefile.
fix version in css
restore automake-related stuff
Added a keyboardview which contains a keyboard that only logs what you type
Basic keyboard that doesn't send over network implemented
Merge branch 'keyboard'

Conflicts:
	Spang-mobile/AndroidManifest.xml
	Spang-mobile/bin/AndroidManifest.xml
	Spang-mobile/gen/spang/mobile/R.java
	Spang-mobile/res/values/strings.xml
	Spang-mobile/src/spang/mobile/KeyboardService.java
	Spang-mobile/src/spang/mobile/MainActivity.java
Fixed orientation type value in sensorListBuilder
rm neobundle.vim from submodule + modified some files
Switched to volumeicon because volwheel is shitty :( its really slow and written in perl whereas volumeicon is in C, mush better and much more functional
Added bash_profile to load bashrc on non interactive runs
cleaning up redundant stuff
synchronization commit, not all tests pass, does not compile!
Working on sessionfactory mechanism, using SqLite in memory test database
Refactured login controller tests, have to add more tests to get the required functionality
Added tests for login procedure
Working on login procedure in different environments, 6 tests fail, have to implement proper authorization
Implemented session state of environment in which user wants or is logged in
Implemented Transaction attr not running when LoginController
Implementing session management of environment and connectins
Implemented a cache to store for SqLite to cache a connection
Working on in memory database mechanism, one test fails
Got the in memory db working!
Refactured the controller class and implemented static helper class to manage session state management
Implemented new install of environment and login acceptance tests, to do: refacture SessionStateManager remove responsibility for setting up a database.
Added support for Widget options per Element/Widget
Implemented custom 404/ Error pages (not perfect yet...)
Implemented custom 404/ Error pages (not perfect yet...)
Implemented Markdown support
Han: add mini away day widget, start implementing the Hotel widget
ENH: Refactored some methods so that smaller bits can be overloaded/reused.
ENH: Brought HDDMRegression up-to-date.
Fixed indentation and readded outlier test (merge conflicts).
Ruusukartta 2012
Add linefeeds
unminify miniui.js
游记列表与添加游记
Merge branch 'master' of github.com:hellocreep/uto

Conflicts:
	application/controllers/travelnote.php
Merge branch 'master' of github.com:henrikuu/Hauli

Conflicts:
	Hauli/MainUI.Designer.cs
	Hauli/MainUI.cs
gitignore päivitetty
Merge branch 'master' of github.com:henrikuu/Hauli

Conflicts:
	Hauli/HauliDB.sdf
	Hauli/HauliDBHandler.cs
Sekoilukorjaus.
Lisää sekoilua.
bumped server version number
remove references
try adding the file element again
Measurement of detectors offset with Type I positions
Cleanup on Sirlin, Shann g, h radiative corrections
Assume we are using a modern enough version of ROOT for TH1::IntegralAndError
Apply rect.
When recursively calling update_payment_status make sure we send the cart_class back in
Merge branch 'hotfix/braintree_update_payment_status_fix'
Version bump
Merge branch 'hotfix/version_bump'
Fixed readline.
Tab title reflects page title.
Fixed huge delay in file loading.
Fixed issue #644 - added MongoDB to the .travis.yml file so CI will still work after Sept. 14th.
Merge pull request #645 from jrgifford/issue-644

Fixes issue #644 - added MongoDB to the .travis.yml file.
functioning gdocs maps via rake
Added files needed for new movie player
Adding the sample api interaction app Jake and I created.
Merge branch 'master' of github.com:hudl/hudl-win8
DTC - the Definite Three Characters
unblackout tabs after creating budget
added dollar sign to category list view, added input checking for new categories
Merge branch 'master' of github.com:hungryha/6.813
add file test
add file test2
validate #80 Userliste Dropdown und Textfeld validiert
Firmware is now running again, fixed bug in pid.c. Also fixed error during servo in.
ARM: mmp: add usb device support for PXA910

Add usb device support for Marvell PXA910.
Actually PXA920 will use the same device.

Signed-off-by: Neil Zhang <zhangwm@marvell.com>
Signed-off-by: Haojian Zhuang <haojian.zhuang@gmail.com>
ARM: mmp: add usb device support for ttc dkb

There is an U2O OTG controller on ttc dkb, this patch is going to enable
it.
At this moment, it can only works in device mode, because when works in
host mode, it needs to supply vbus, but we have no vbus driver added
at this moment. Once the vbus driver is added, I'll prepar another
patch to enable the switch function.

Signed-off-by: Neil Zhang <zhangwm@marvell.com>
Signed-off-by: Haojian Zhuang <haojian.zhuang@gmail.com>
ARM: mmp: add usb host support for PXA168

The ehci-mv can support PXA168, PXA910 and PXA920, use this driver to
support pxa168 SPH usb.

Signed-off-by: Neil Zhang <zhangwm@marvell.com>
Signed-off-by: Haojian Zhuang <haojian.zhuang@gmail.com>
ARM: mmp: add usb host support for aspen

Signed-off-by: Neil Zhang <zhangwm@marvell.com>
Signed-off-by: Haojian Zhuang <haojian.zhuang@gmail.com>
ARM: pxa: Add standard UART to hx4700_pin_config[]

Add the two standard UART signals (GPIO46_STUART_RXD, GPIO47_STUART_TXD) to the
initial mfp config table hx4700_pin_config[] passed to pxa2xx_mfp_config().
Although pxa2xx_transceiver_mode() can subsequently set these two signals via
its own call to pxa2xx_mfp_config(), pxa2xx_transceiver_mode() is only present
when CONFIG_PXA_FICP=y. Hence this patch provides a default mfp config.

Signed-off-by: Paul Parsons <lost.distance@yahoo.com>
Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>
pcmcia: add driver for hx4700

This patch adds support for the HP iPAQ hx4700 to the existing
pxa2xx-pcmcia driver.

Signed-off-by: Paul Parsons <lost.distance@yahoo.com>
Cc: Philipp Zabel <philipp.zabel@gmail.com>
Signed-off-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Add Add script to do bad MGI id (renamed by JAX) fix
Auto cleanup (resharper) and move to .net 4
restringir data futura de associação
inconstructed the server.js file. removed index.js. Installed mongoose, socket.io
Avoid circular import by moving import inside function.
Allow loading of schema pointed to by symlinks
Fix missing is_primary attribute on columns
Remove symlink resolution (realpath would have been better anyway) as it seems to be unneeded
Implement support for extended inserts (#88)
Fix copyright date in test
RETURNS COLUMN assertions should allow empty result sets (#56)
Stop using 5.3 Exception form and just rethrow non-general errors
Merge pull request #92 from iarna/fix_pdoexceptions

Stop using 5.3 Exception form and just rethrow non-general errors
Merge pull request #89 from iarna/extended_inserts

Implement support for extended inserts (#88)
Merge pull request #91 from iarna/returns_column_assert

RETURNS COLUMN assertions should allow empty result sets (#56)
Merge pull request #87 from iarna/symlinks

Refactor loader choice into a method
Merge pull request #86 from iarna/primary-fix

Fix missing is_primary attribute on columns
Update src/rosfarmmodule.c
Changed the readme according to my changes
パイプライン版の若干の動作周波数向上
パイプライン版をホールがなるべく開かないように改良. パイプライン版の論理合成結果を更新.
use red-black BST in EventSearchTree, for balancing without shuffling
use EventSearchTree to draw boxes in TimeLine faster
Closest permutation problem draft
Shrunk the board even more!
missing semicolon fuu
First MVC implementation of all class

to test /users
allow set lock expire
Add phpDoc blocks

Add phpDoc blocks to arrayList package and mpr_config
Fixed possible null reference crash in Entity.GetRegistrationConfig.
Removed obsolete StaticEntity / Entity seperation code in ScriptCompiler.LoadAssembly.
CScriptAssembly & CScriptClass ctor: m_refs(0)
CScriptSystem::DoReload: Don't insert CryBrary assembly twice.
Merge branch 'master' of github.com:inkdev/CryMono
Merge branch 'master' of github.com:inkdev/CryMono
CScriptClass dtor: Don't call UnregisterListener twice.
CScriptSystem::DoReload: Kill previous app domain, reverting will be sorted by reloading dll's in a new app domain later.
WIP: Moved script domain handling to ScriptManager.
Merge branch 'master' of github.com:inkdev/CryMono
ScriptManager: Make sure a default gamemode is assigned.
Actor.Create: Override className is useMonoActor was set
adapted to new file structure
change init db script
Правила для 'Квартал А101'
py file for test
deps
resolve
Updated template code to use new dimension typename.
Add operator<< for std::vector as it is required for Value.
Missing radians function.
infusion.rb -> teapot.rb
Made private application_name static.
modified domain model year and month combined to become date
Swiping now works
уведомления для пльзователя
Astar casi terminado, falta probarlo
update 'confirm restart' checkbox after creation
issue438 - updated loggers.
issue438 - RequestHandler should only throw IO exception.
issue438 - Minor improvements based on feedback
removing todo to their rightfull place - todo.org
dmenu seksiness
KOKU-1183. KOKULT-152. Synchronization of columns.

The columns are now synchronized, but they aren't yet sorted; the tests fail in this commit.
Moved the CSV export stuff into their own package (fi.arcusys.koku.web.exporter.csv).
KOKU-1183. KOKULT-152. Did date sorting.

The exporter now synchronizes the same dates to same columns in addition to sorting the date columns.
Tests also pass in this commit.
Made a column interface and two implementations:
	SynchronizedUniqueItemsColumn uses a Map for the answers of people which
	allows syncing the answers to same columns.
	ListItemsColumn uses a List which allows for multiple answers, and retains
	the import order of the answers, but doesn't sync the same answers to same column.
KOKU-1183. KOKULT-152. Added natural sorting for dates.

Added natural sorting to dates from Strings.java.
It's better but not perfect, it fails to sort right in the borders of months but
I'm unable to fix this as long as the data that the webservice gives can include
dates in hour, day or week precision without any type information about which
one it is.
Merge branch 'develop' into KOKU-1183

Conflicts:
	arcusys-portlet/koku-message-portlet/src/main/java/fi/arcusys/koku/web/ExportFileController.java
	arcusys-portlet/koku-message-portlet/src/main/java/fi/arcusys/koku/web/exporter/csv/CSVExporter.java
	arcusys-portlet/koku-message-portlet/src/test/java/fi/arcusys/koku/web/ExportFileControllerTest.java
Added files to .gitignore that weren't previously there:

Files arcusys kuko guys use to deploy local machine servers, they have per-user
settings in them so they can't really be in the repository:
kunpo.sh
loora.sh

Some autogenerated local files are generated with this name:
portlet_2_0.tld

Also autogenerated folder:
koku-layout-portlet/src/main/webapp/WEB-INF/theme/
KOKU-1183. KOKULT-68. Renamed filenames to be consistent

Column -> CSVColumn (interface)
ListItemsColumn -> ListItemsCSVColumn (impl.)
SynchronizedUniqueItemsColumn -> SynchronizedUniqueItemsCSVColumn (impl.)
Merge branch 'develop' into KOKU-1183
Create all sub-folders
do not stop/close_stream if not running
add code climate badge to the readme
Don't retry if we've already retried the specified number of times (instead of once more)
Don't convert numbers to boolean when applying the user-set default retry value
Fixed DebugTabs
Fixed DebugTabs
ultima del dia
Merge branch 'master' of github.com:jairot/informe
adding wp-maintenance plugin and mommies maintenance style css
support chromium build
Make resampling precision configurable.
Ignore Eclipse/PyDev files.
Fix some things noticed by PyDev.
WIP - event parsing
adding monday oct 8 lab notes to recitation one
Change new task and back buttons on Departments show to Buttons
add scroll block to mechand
Fixed Nsnce Height for form. and set up scroll block for Ergos form
added 16bit mov and jg
spelling error in docs
combining instructions directly
raw data sections and blocks part three
Make labels for tags work as radio buttons
Comment about switch to Proximobus
Put all conventions indexes to relate to new index and added tests for finding views based on culture
Sorted out namespaces
Map <leader>A to Ack inner word in normal mode
Another 'dev' push. Implemented isolog.cli. Implemented main isolog runtime. Implemented better logging functionality.
Started changing the dependency system for modules

Will do changes to the loader later
NOJIRA:  Add method documentation to getDlmPathref
NOJIRA:  Add method documentation for getDlmNoderef
UP-3340 Adding REST service for display an individual user by username
Merge branch 'master' of github.com:Jasig/uPortal into drew
UP-3340 Completing new REST service for individual person lookup
Merge branch 'UP-3340'

* UP-3340:
  UP-3340 Completing new REST service for individual person lookup
UP-3341:  Change the default DLM ConfigurationLoader to the JPA (database-persisted) implementation
Merge branch 'UP-3341'
Merge branch 'master' of github.com:Jasig/uPortal into drew
UP-3341:  Deprecate LegacyConfigurationLoader, now that's it's not the default
UP-3342 Adding tab information to layout.json and adding alternate list-based home screen view to mobile theme
Merge branch 'UP-3342'

* UP-3342:
  UP-3342 Adding tab information to layout.json and adding alternate list-based home screen view to mobile theme
UP-3342 Setting the default mobile home screen view to grid-based
UP-3343 Adding new DLM profile evaluator
UP-3343 Updating new profile evaluator to work with IProfileMapper service to avoid circular spring references
Merge branch 'UP-3343'

* UP-3343:
  UP-3343 Updating new profile evaluator to work with IProfileMapper service to avoid circular spring references
  UP-3343 Adding new DLM profile evaluator
UP-3344:  LayoutPortalDataType only knows about the legacy file extension for fragment layouts, not the current one
Merge branch 'drew'
UP-3344:  Adding a unit test that would have caught the bug if it were present.
UP-3251:  issue importing layouts in the 4.0.2 build with data from 3.2.x build.

The problem is that the import process was converting bad DLM pathrefs
(representing orphaned data) to zero-length strings.  It seems Oracle, for no
reason I can come to terms with, interprets zero-length strings as null on
insert/update.  The column in question is non-nullable, and this combination
gives rise to the error.
Changed TYPE=MyISAM to ENGINE=MyISAM for MySQL > 5.4.4 compatibility

Also added it to a few tables where the TYPE/ENGINE was
not specified at all.

Fixes #1
Changed timestamp(14) into timestamp

Needed for MySQL > 5.5 compatibility.

Fixes #2
Removed pass-by-reference for PHP 5.4 compatibility

#3
Added missing French translations

Thanks to @tonin

issue #6
Remove warning about undefined variable on person page

Issue #30
Remove warning about undefined variable on report page

Notice: Undefined variable: pop_array in /var/www/photo/htdocs/classes/zophTable.inc.php on line 504

Issue #30
Remove warnings about undefined variable on report page

Notice: Undefined variable: ratings in /var/www/devphoto/htdocs/photo.inc.php on line 1732

Notice: Undefined variable: value_array in /var/www/photo/htdocs/photo.inc.php on line 1751

Notice: Undefined variable: html in /var/www/photo/htdocs/photo.inc.php on line 1754

Issue #30
First step in creating unittests for Zoph

The UnitTests directory contains a set of tests that can be
used with phpunit. At this moment there is around 10% code
coverage.
Testdata can be generated with the scripts in createTestData

issue #29
Refactor of PHP part of Mapping implementation

This rewrites almost all the PHP mapping code that generates the
JavaScript for displaying the maps.
A lot of HTML and JavaScript has been moved into templates and
several design changes have been made, resulting in compacter
and cleaner code with less repition.
Small change in way template is called on photo page

Full page templates are now "templates" and partial pages are "blocks"
Move timezone-related global functions into class

Getting rid of global functions in favour of static functions
for timezone class.
TimeZone object improvements

Split file in TimeZone and Time class
Move into classes dir
Added phpdoc documentation
Fixed: PHP Notice: Array to string conversion

PHP Notice: Array to string conversion in
/var/www/zoph/cli/arguments.inc.php on line 352

Closes #3
Fixed several errors in geotagging code

- Wrong debugging code
- Insufficient checking for empty resultsets causing
  "undefined offsett" errors
- Refactor of other parts of Zoph not incorporated in
  Geotagging code.

Closes #31
Merge branch 'issue#2' into 0.9maint
Merge branch 'issue#30' into 0.9maint
Merge branch 'issue#31' into 0.9maint
Fixed: PHP Notice: Array to string conversion (2)

PHP Notice: Array to string conversion in
/var/www/zoph/classes/zophTable.inc.php on line 94

Closes #3
Fixed: no error message when rotate fails

Closes #33
Merge branch 'issue#33' into 0.9maint
added all build files
object not @object
Testing windows setup...
testing commit
20120326

name change

Signed-off-by: Hyunjin.jang <jhjang@huray.net>
Reserve; skirts
Setup environment for Homebrew supplied GCC-4.2
Setup environment for Homebrew supplied Android SDK
Load shell-completion for nvm if file exists
Update private and emacs.d submodules
go/gdb.yac Added
Support for Template_App_Zabbix_Agent in Zabbix 2.0.
Finish up basic template for Sun JVM (Hotspot).
String-to-number coercion implemented (useful for zabbix items).
Fix for zabbix.bsh.
JBoss templates and functions.
Merge pull request #2 from jitlogic/dev1

Dev1 patches
Merge pull request #3 from jitlogic/dev1

incorporate bsh 2.2r0
Merge pull request #4 from jitlogic/dev1

Various fixes around BSH and ASM.
Merge branch 'master' of github-jitlogic:jitlogic/zorka into dev1
Use BSH 2 ellipsis feature in world-visible zorka library functions.
Some part of JBoss 5 JMX (defunct without proper agent class loading)
JBoss 5.x JMX server support.
initial hookup of linking_to
call path.expand on file argument
Improved comments on 0-freq on rescale
Added #define for 0-freq on rescale
First from windows
added alias to move to ~/tmp
README.md delete
added code handling
fixing tag handling
Move read-delimited-pcre below definition of scanner macro
Functionality for resetting the simulation phase (work in progress for story #199)
Set simulation length to 60000, passes the tests but is noticibly faster
Use extend instead of reset #199
Iterator for instead of for each 
Merge branch 'master' into extendSimulationPhase
Copy list of listeners instead of using iterator, story #199 
Change names of phases, story #199
Supress warnings 
Use waiting task for input, changed phase names (story #199)
Typos
Changed constructor to support treatment description in NetworkBuilder (story #473)
First commit for HID AVR code.
Added HID PC code.
HID PC Code fix.  Still needs some work.

Some path issues with USB HID library.  Will fix in later.
Added Eagle CAD files.

Also contains the gerber files that were sent to the fab house.
local mongo

Signed-off-by: John Griffiths <john@johnantoni.com>
Mummy walks around
support gravatar
Added link support back into the sub header and provided a link in the editor back to the containing folder.
README.md corrections and additions
adds ant file to work from command line
remove duplicate before_filter
Fixed a demotion bug in fmpz/setbit.c.
Merge commit 'sebastian/trunk' into trunk

Conflicts:
	fmpz/setbit.c
Merge commit 'fredrik/trunk' into trunk
fix an accident in a previous commit
Fixed configure bug with latest version of MPFR.
Removed some scary messages from configure test "failures".
Reverted to two messages for popcount tests.
Only run popcount native test on x86_64.
Another mpfr configure bug fixed.
Added missing newline.
Added ia64 assembly code.
Another missing newline.
Another missing newline.
Added ARM assembly code.
Merge commit 'fredrik/trunk' into trunk
Attempt to fix a macro error.
Another missing newline.
More newlines.
More newlines.
Another newline.
Core: extend storage layer API.

Add 4 methods to DeepaMehtaStorage:

    RelatedTopicModel            getTopicRelatedTopic(long topicId, String assocTypeUri, ...)
    ResultSet<RelatedTopicModel> getTopicRelatedTopics(long topicId, String assocTypeUri, ...)

    RelatedTopicModel            getAssociationRelatedTopic(long assocId, String assocTypeUri, ...)
    ResultSet<RelatedTopicModel> getAssociationRelatedTopics(long assocId, String assocTypeUri, ...)
Merge branch 'master' into lowlevel-type-loading
Type Editor: adpat to core changes (#48).

The TypeRenderer base class is loaded through new synchronous load mechanism (script/helper/).

See ticket 48.
Added owlowsci..wisi..named owl, make simlik for realname, I unable to rmmember
Added discor the puppet master
Adult Cadance, not perfect but suit the needs
updating readme with ponyquotes
bash completion dependency reduction and update
Move homeponies to .config/ponysay/
Don't use $0 as base for ponysaylist, if you use ponythink it would result in ponythinklist which doesn't exist
I also got a lastname :)
Merge pull request #36 from etu/master

Fixed a bug with ponysaylist, added my lastname to credits and moved homeponies
.local/share instead of .config
Merge pull request #1 from erkin/master

get up to date
Added completions for the fish and fishfish(a fork of fish) shell
Merge pull request #37 from etu/master

Added completions for the fish/fishfish-shell
m manuals
autogeneration of ponythink shell completions from ponysay completions
Merge remote-tracking branch 'upstream/master'
updated pprint call
added a theoretical correction
script: cleaner path in install
building up fixed instructions
finished fixedobs, working on flexobs
added macos opts
 a bunch of tmux projects
update textmate script
updated macvim installation and default to always use system for macvim
Reorganized in two sub-modules : skin (FS skin) and XAR (configuration
and icons)
Fix build
Getting closer to recovering the key -- develop a more useful report.
Output a key file.
xor-me now xors with a keyfile
rainbow world
first commit
2nd
Delete file

Please enter the commit message for your changes. Lines starting
TEST
Merge github.com:k2OS/CykelRace
correction for "dd on usb"
Modified the camera movement to make it seem some what smoother but still have a lot of work to do
Update features-json/websockets.json

Opera Mobile 12.1 has full WebSocket support enabled:

http://my.opera.com/ODIN/blog/opera-mobile-12-1-with-spdy-web-sockets-flexbox-and-more
Spotted another occasion of needless mutability.
There is no point nilling out ivars at init time.
Make .expandedNodeIdentifiers sane by declaring as NSArray, copy.
Rename as -_setExpandedNodeIdentifiersFromOutlineView for clarity.
Persist node expansion as it happens.
Redeclare .selectedNodeIdentifier to be copy, and persist the selection.
No longer care about observing termination.
Revert "kõik on katki"

This reverts commit 7bb5bf83e11c4a8cf9e05c35f07bc514a2f9d883.
removed old comment
returns dirichlet output to double, temporarily. To be fixed by issue #36
count the number of visible thumbnails instead of calculating it. dont refresh the screen if a non-visible thumbnail is added
show main image info even if its not loaded
modal popup, typepohead 추가
add todo nxt
Make fake forecast increase as it should
alright, csrf middleware is playing nicely with AJAX now thanks to some javascript from the django docs
Run shorter FannkuchRedux and NBody tests since we're not forcing js.exe to fully optimize them anymore.
Fix more strict mode errors.
Fix HideBaseMethod by ensuring non-virtual methods are called through the prototype unless they are sealed or the defining type has no derived types.
Hashable colors - because it's easy
changes from yesterday that i forgot to commit
switched thresholdBarView to use levelListener pattern
moving setEffectOn into base effect, only specific native effectOn call is delegated to effect children
Merged in n1 cpus
conjure: add end test suite macro to lexer spec
Added lwjgl
Added lwjgl
Fixed bug in clearfix, updated css
Finished the third part of the lecture on Pattern Matching.
Fix render of test template
Convert glance to glance/openstack/common/setup.py

Convert glance to use glance/openstack/common/setup.py
to write the changelog.

Change-Id: Ibadec15d7e530149cf62cd00d63c06bf63cf53bb
Signed-off-by: Chuck Short <chuck.short@canonical.com>
Add localization catalog and initial po files to Glance.
Fix bug 706449.

Change-Id: I5e8e0ff0161d9db0253db12284cce347aacbac5f
Merge "Convert glance to glance/openstack/common/setup.py"
Merge "Add localization catalog and initial po files to Glance. Fix bug 706449."
Tag v0.2.1
Breaking change: counters are now resetting and statman_server sends the count of events in the last window, same for statman_aggregator.
Tag v0.3.0
agregando prueba de concepto1
Cloudfront wait until updated
Typo
Characterization tests for TimeEntryGroup
Fixes #74, this uses complex keys with the hadoop collector to collect metrics per example log files
Teammate positions fixed and tested.
Initial style done, initial work on backbone app
added postgresql jdbc to maven dependencies
Irish translation file cleaned up + new translations
Simplify template inclusion.
Respect our coding style conventions.
Irish translation file cleaned up + new translations
Merge remote-tracking branch 'upstream/master'
fix to pass tests with ruby 2.0.0 preview2.
AS7-4004: fix JMS Queue selector parsing

* parse the selector element correctly (using its string attribute)
* marshall it to have the same output than the XML input
[AS7-2685] Add some validation of criteria combinations
[AS7-2685] Disable the inet-addresss and link-local check for now
[AS7-4133] fix address settings handler again
AS7-3696 Replace hardcoded localhost from 2 IIOP tests.
AS7-4128 allow non-Hibernate persistence providers to be packaged with the application (like ogm)
[AS7-4120] Update jbosgi bundle versions to use Final qualifier
AS7-4150 Fix up jacc service naming
[AS7-1893] Update test case with new xsd elements.
Fixing jira AS7-2757 by adding functionality to update a current user and roles
AS7-4123 using system properties instead of hardcoded paths
Post merge clean up.
AS7-3938 RA enable deployment fails; AS7-4139 Resource adapters subsystem doesn't unregister JNDI names of undeployed resources
AS7-4162 EJB components do not have dependencies on the ModuleDeployment service
JQuery UI with selectable, sortable, accordion and button.
Basic player list controls.
JQuery-UI with sortable, accordion, button and the Blitzer theme.

unzip -f ~/Downloads/jquery-ui-1.8.20.custom.zip css/\* js/\* -d resources/public/
Integrate some of the UI components and triggers to start the game.
add eap5 hornetQ test code