labofsahil/github-event-dataset-2012 huggingface dataset:
mm
Merge branch 'master' of github.com:sinuni/Fellesprosjektet

Conflicts:
	fellesprosjektet/CalendarProgram.class
Visual Studio being asshat
change in the name of test application
qmake|Mac OS X: Fixed a bundling issue with the FMOD shared library

When the engine subproject is rebuilt, the bundled Framework folder
is emptied. The FMOD shared library was copied there only when the
FMOD plugin was built, causing a situation where the plugin would be
missing the FMOD library after rebuilding just the engine.
Fixed: Inappropriate use of extern
Updating for test vars
Make slowmoVideo translatable.
German translation started.
Simplified model, removed concept of 'segments'; each message is autonomous.
Stubbed out new handler.
TERROR PAIN SORROWgit branchgit branch
Tweaks
Clarified referers are all search engines
Merge branch 'master' into feature/jvm
Removed useless sln files
registrierung ansatz
All of these defaults were not relevant
array expression added, tests in progress
got PCA to not break
Updated title on the comments and also changed the URL base parsing method to be located in YCParser.
started reworking icinga installer
Fix error in category overview.
Added Gummi 0.2.1
SDObjection 0.1.1
added get all subclasses helper
include reset. easier to remove than to go get
Removed bin/ and scripted ec2 knife execution for now.
TST: Make sure labels pass through patsy ok
Handles task that have been deleted on either the server or the computer
Fixed event for post-processing list.
Fixed bad list listener
Moved store methods into store definition.
Moved specs to categorizing folders. Added SS lift model.
Remove old releases
Refactored code, made some improvements
new file:   driver/s3c2410/vars.mk
murabootstrap edits
Switching how inline editor is toggle on.
Merge branch 'develop' of github.com:blueriver/MuraCMS into develop
Merge pull request #646 from stevewithington/develop

fix typo on Site Config plugin settings screen
OK forget about ruby gems requirements.
first commit
epicness
added .vim folder
added some snippets
cool snips
multiple rc changes
auto indent
conky added
added cool conky stuff
README update
nicer conky
Edited README via GitHub
bash overlap fix
meh
vim
Add an element to EE subsystem to control property replacement in spec descriptors
undeleteddatabase.py
login verifier works
Merge branch 'master' of https://github.com/stuycs-ml7/project1-pd7
edited README to reflect stuff I've done 9/25 and 9/26
basic structure stuff
fixed it
sup
Removed unused logger.
Refactorings
Refactorings
confirm reopen
revert failed git merge butchery
CA: action committee extraction for
Merge branch 'master' of github.com:sunlightlabs/openstates
ND: Starting to snag some useful data
Styling and markup changes to reflect changes made to the website. Dropped unused code.
finished step 3b in ssl_client
Fixed Mary's questionnametext issue
How to parse JSON response #9
broken link fixed
Merge branch 'master' of https://github.com/susulim/ROC-Development
Finished "I Seen 'Em Go". Page 64.
-output basename
added development_result delete function
compress state file and fetch request
指定した子要素の高さを揃えるheightLineプラグインを追加
made it so that the textfields go blank after submitting with button
Fix: Make purge work for *root attributes.
Create items with correct severity
Merge branch 'ics' of git://github.com/teamgummy/android_build into MotoICS
cleanup #chat-view before loading
UITest using travis-ci
Draft, burn, reconstruct.
Draft, burn, reconstruct.
Draft, burn, reconstruct.
Added support for FirefoxProfiles
Added support for capturing.
got storeData to process but stores as null
all form elements save except for radio button value.
Merge remote-tracking branch 'origin/gh-pages'
[Server]: This file is already moved to config folder.
Made font in results tables smaller
Merge branch 'master' of git://github.com/ianstewart30223/GIVECenter
Merge branch 'master' of git://github.com/ianstewart30223/GIVECenter
Merge branch 'master' of git://github.com/ianstewart30223/GIVECenter
Fixed EditPage.php layout issues
Merge branch 'master' of git://github.com/the2baddavid/GIVECenter
test my editpage
EditPage now displays all known Agency/Program info
Merge branch 'master' of git://github.com/kgilmer90/GIVECenter
Fixed EditPage look
Merge branch 'master' of git://github.com/ianstewart30223/GIVECenter
Changed update function to redirect back, and report errors
basic header styling
updated style info
Add gem deps
MA21
Created class DotFile and added method to setup tmux dotfiles
Added heatmap.js and heatmap-gmaps.js to the static folder
Build version 1.4.18.19082.
Make sure squad validation uses the league settings
Minor golfage
HTML Updates

added checkin screen.
Fix README

  Add proper attribution for om.rb and rdio.rb.
  Fix code markup.
Schedule chart dependencies
fixed some code
removed unused code
Got option types to serialize

All discriminated unions probably serialize, but I have to add tests to
make sure
Added tests for custom discriminated union serialization

And they pass :D
Implemented deserialize for discriminated unions

yep, pretty sweet. I'm tired though
Added additional acceptance test + better readme
added fiwalk as mostly done by Kevin Fairbanks
added fiwalk as mostly done by Kevin Fairbanks
Merge branch 'master' of github.com:simsong/sleuthkit
removed materials created by autoconf
removed more files generated by configure and libtool
fixed up autoconf make of fiwalk
fixed headers and autoconf to find err(), errx(), warn() and warnx() present on mac systems
removed test files not needed
additional work to make fiwalk compile on Ubuntu 12.10
removed tre-0.8.0; it will not be part of fiwalk distribution
removing items not needed for SleuthKit version of fiwalk
removed more stuff not needed
removed more stuff not needed
removed more files; put myglob into plugin.cpp
removed more files; put myglob into plugin.cpp
removed FIWALK version number
removed metadata extraction to XML file of AFF metadata
add info message indicating sqlite version and mode it loaded (native/pure java)
Merge branch 'master' of https://github.com/sleuthkit/sleuthkit
Merge branch 'master' of https://github.com/sleuthkit/sleuthkit
Rename 'admin' to 'manager' in access.php
Remove usersummaryview.controller.php and move code into usersummaryview.php.
Disable direct access to editview.controller.php
Add "supports" function.
Add string for "pluginname"
Add backup/restore code.
Better fix for negative BER-encoded numbers.
Draw handles on the grid.
Display time taken to render each frame.
Draw a line between the start and end handles.
Only draw half a grid at the endges.
Start thinking about limiting end handle to adjacent grids.
quote is required for select.
Example Google Chart of political position
added project 2 en 3
Fresh/stale cache notes
variables naming
patch to remove script filename from output (user is working on a buffer)
Tweak script filename filter a bit

This one should only remove the script filename, and leave other things that
match /\(.*:\d+\)$/ unchanged.
Adding a way to ensure the REPL can only b sarted once per instance
Merge branch 'master' of github.com:moritz/try.rakudo.org
Adding a CREDTIS and a SETUP file to explain how to setup the system if someone wanted to test the server.
[frontend] link to perl6.org/documentation, it is more general than the advent calendar link
Fix regex in chapter 2, put real code in 2/3 & 3/3
More readable syntax for the tutorial regexes

Give "match" an array and it'll join with \s*. There doesn't seem to be any
other regexy stuff here besides that, maybe I'll get rid of more backslashes
later.
Replace placeholder examples with list op stuff

Seems like it needs to be fixed to not insert raw HTML...
Fix code typos. Spotted by benabik++
Make the backend less of a hassle to use

  - Use autodie;
  - Use a reasonable default perl6 command when .config doesn't exist
  - Added a comment explaining what .config *is*
  - Don't explode when a stale pidfile exists
Put die() error strings in one place

(and fix a typo too)
Normalise whitespace
Make the backend more readable

Consistent indenting, formatting/refactoring/etc.
Redo the documentation so it looks nicer
I should probably just fix this properly
Tweak CSS to make output readable; fixes issue #16
upstream changes
m
Fixed Manual Date from get_days
m
m
m
m
Further expand explaining git submodule setup.
fixes the assets relating to travis-ic/travis-ci#651 change
Merge pull request #21 from sethvargo/fix_owner_name

fixes the assets relating to travis-ci/travis-ci#651 change
rebundle the bundle before deploying the bundle
updated some views and added admin controller option
make sure we use utc
gcode_process.c: remove more redundant code.

Saves yet another 122 bytes.
Review power supply timeout.

- Move the variable from dda.c to pinio.c.

- Reset the timeout on each power on, to guarantee a minimum PSU on time.
Introduce an integer multiply-divide algorithm.

We have multiplies followed by divides all over the place and
most of them are difficult to handle regarding overflows. This
new algorithm handles this fine in all cases, as long as all
three operators and the overall result fits into 32 bits.
Make muldiv() multiplicand signed.

As Andrey correctly pointed out, we need this signed. See:
http://forums.reprap.org/read.php?147,89710,130225#msg-130225
and following posts.
Makefile: clarify definition of the firmware upload device in use.

Programmers typically don't do baud rate, so setting the avrdude -b
flag has to be avoided in this case.
Makefile: don't provide means for programming fuses.

Programming fuses doesn't belong to the firmware or to firmware
uploading. Fuses have to match the hardware and the bootloader,
so they should be set when setting up these.
слайдер
Merge branch 'master' of github.com:trinitron2005/freewrite
init with existing file
Moved the value property to change the order the properties are evaluated in. Changed the way I'm letting :enable take the value of :value.
[WebKit]
  Add many pages about the "loading" topic.
  Add pages about the flow of main resource loading.
  Add some pages about the flow of subresource loading (not finished yet).
m2e doesn't support partial-builds, so restoring configuration a little bit to do work and will come back to configration soon
adding log bridge, which is useful for debugging
Merge branch 'master' of github.com:uber/uber-android-utils

Conflicts:
	.classpath
	libs/acra-4.3.0.jar
after merge
update readme with heroku instructions
FPS Limit
	Defined in Debug.h
	Comment out the define line to disable FPS limit
	Limit value defined in Debug.h
got rid of SQL/NoSQL distinction (thanks, Michael). Added Welle, Neocons.
Module system no longer depends on Context.
Added better caching. Much better performance now.
Added utility class to handle common stream related tasks.
Merged master into codingtracker.
Merged codingtracker into codingtracker-ast-inference.
first commit
簡易版に変更
before devise views generation
iteration3 complete except for tests
robert testing help
updating compatibility line in README
opensc-explorer: use standard usage() everywhere

With the improvements of the man page, there is no need any more to have
local help texts for functions.
opensc-explorer: convert CHANGE & UNBLOCK to sc_pin_cmd
opensc-explorer: allow entering the PIN interactively

In VERIFY, allow the user to enter the PIN unteractively if it was not given
on the command line, and if the card reader does not support PIN input.

If it was not given on the command line and the card reader supports PIN input,
then the bahaviour is unchanged: enter PIN via card reader.
opensc-explorer: increase allowed bytes in RANDOM

Allow to fetch up to 256 random bytes from the card -
236 being the maximal value for Le in short APDUs.
opensc-explorer: show text message for APDU result
Added configurable option to interrupt service being unscheduled
Added rollback capability to the Admin tool
Fixed the confusing display messages for Admin tool rollback service
Added ScanPermitWrapper class and general cleanup
Removed jmx managed for scanpermitwrapper
Created a separate scheduler operation to terminate jobs. Disable will simply unschedule and not force kill.
Fixed a potential deadlock issue in ScanPermitWrapper
add zoned option for restore from replicas
add tests for zoned restore
Minor change to in getReplicationMapping
Revert "add clientId for voldemort client"

This reverts commit ddded7cf0af82cc1a789ca8426ef6c48744bf445.

ClientId implementation will be released after we do one more open-source release before our next Major open-source release.
Fixed a merge conflict in VoldemortAdminTool
Merge branch 'scanpermit-bug'
First version of the game
Tells you about the game
Merge https://github.com/virajs07/guessTheNumber
Fixed bug with alternating between ordered and unordered lists which were nested in each other.
changelog
translation update
correct spelling of Rubén
logcat
fix typo
market desc update
es update
moved to http://www.getlocalization.com
korean translation
bind service to notification
move tranlation to http://www.getlocalization.com/cputuner/
updated market description (removed gps)
Korean market description
Korean tranlator
add title
fix crash
translation update
changelog
typos
move to android strings files (for translation)
- new task that can encode bitmaps
Merge branch 'master' of github.com:vshcryabets/V2AndLib.UI
Merge branch 'master' into API10
Fixed RU localization string
Merge branch 'master' into API10
Fixed thread shutdown process in UDPBroadcastDiscovery.java
Merge branch 'master' into API10
Added more category handlers. Implemented saving and retrieval for categories.
cleanup and extra testing
Invalid group is the parent of root group

It can avoid some errors. Add a root group is much easier
fixme: how to add to previous group in invalid group
Messy code fixes
Add the gamequery link
GamePad fixes
Caches some objects
Add native code + fixes
Fixed recognition error
Added writeup from http://weston.ruter.net/projects/rutersearch/
文档模板

模板啊
Revert "文档模板"

This reverts commit 9fca25568533065ca41b2bb5257e4b0d86db28c0.
Revert "Revert "文档模板""

This reverts commit 55620465fd8fc760f4f214421310e23933626bba.
Fix missing label translation if parameter doesn't have a description.
Update version
del zhongwen
upload defaultActvity function
adding methodrequest subclassing to avoid monkeypatching
User forms, dynamic phrases when adding pages, profile tuning
commit before merge
Merge remote-tracking branch 'origin/master'
第五章 完结
fix units for total autostops
few comments from laptop
shakespeare-js 1.0.2/1.1
Fixes the preamble.
Fixes typos in the first part.
Merge pull request #1 from Emm/master

Coquilles
prelimiary version finished; will do modification and update readme later
modified code; added readibility
updated readme
add mode c_cpp and text
翻译完毕Check-Python-site-packages-for-Updates
Fixed  reference inside a static method
Fixed invalid offset error when trying to split blanked value header
Merge pull request #4 from espiao/master

Fixed two issues
add lusty-explorer and nerdtree-tab plugins

add lusty-explorer and nerdtree-tab plugins
update code comment
new lineup widget
add pin placements bg
animation touch ups
Merge branch 'master' into gh-pages
Merge branch 'gh-pages' of github.com:zohararad/ftbpro-editor into gh-pages
TODO:Frontend fix the assessment submit
README
Merge branch 'master' of github.com:zonyitoo/EduAdminSystem
Reformatted
Added javadoc for Julian day methods, removed Java 6 compiler additions
This class was the predecessor of the Meeus class
partial mode support
change theme & fix _site.yml error
@EWD-618 -> Add new init logic
@EWD-618 -> Add JS roll
Removed hercules specific projects.
Signed-off-by: 0xD34D <clark@scheffsblend.com>

Change-Id: Id8fc294f3c4d83876e5675856d5f9739745a85f8
Databsae Integration

Added more database integration; more setText methods; outline of
"Refresh" Method.
enable TARGET_RELEASETOOL_OTA_FROM_TARGET_SCRIPT for devices with custom releasetools
Allow override of device asserts, including multi-device support.

Set in board file with TARGET_OTA_ASSERT_DEVICE.
Merge "enable TARGET_RELEASETOOL_OTA_FROM_TARGET_SCRIPT for devices with custom releasetools" into jb
Merge "Allow override of device asserts, including multi-device support." into jb
build: Add Qualcomm's helper macros

 * This is used everywhere in Qualcomm's code. There's no reason we need
   to constantly replace it with uglier stuff in our Makefiles.

Change-Id: I0183a338470ec96a38f356a47bae65a0d3fb2c95
enable TARGET_RELEASETOOL_OTA_FROM_TARGET_SCRIPT for devices with custom releasetools
Rebase
Merge changes I9fa027cb,I364a87de,I0183a338,I55919aa0,I5030e271,I7250d12c,I8628c150 into jb

* changes:
  Rebase
  enable TARGET_RELEASETOOL_OTA_FROM_TARGET_SCRIPT for devices with custom releasetools
  build: Add Qualcomm's helper macros
  Merge "Allow override of device asserts, including multi-device support." into jb
  Merge "enable TARGET_RELEASETOOL_OTA_FROM_TARGET_SCRIPT for devices with custom releasetools" into jb
  Allow override of device asserts, including multi-device support.
  enable TARGET_RELEASETOOL_OTA_FROM_TARGET_SCRIPT for devices with custom releasetools
More fixes

We have fixed update message display and an option in relation to
updates. We have also fixed some other small issues
Merge branch 'development' into beta
Merge branch 'beta'
clear functie aan list classe toegevoegd
finished map loading, learning how to shift cursor to balls position
cleaned up authentications controller
<< Import JFX Librarys on the Class >>
<< Import JFX Librarys on the Class >>
fix bug in symlink one-liner
merge disanti changes
add graceful degradation for colorcolumns and blowfish
Merge pull request #4 from evanstachowiak/master

fix blowfish and colorcolumns errors on lower versions of vim
Ignoring files which are different local and remote
Now properly ignoring some files
Sending messages between pages now available via flashdata
Messages now with ability to add class to ul parent
Merge branch 'master' into matteus
Update version of GrowlCappuccino
Numerous fixes and optomizations. See comment.

Pathfinding correctly works, instructions.md updated to reflect changes
to optomizations.
nerfed money
verskta ready
implemented ajax form submit
Content-MD5
Merge branch 'master' of github.com:Athlete/athlete-api-docs
Initial commit from the move from old repository
Added hard location to update
Added AdminNewCardFront/Back
Implemented Class Settings with Method db.reset. Updated DatabaseManager
Settings.java erstellt mit resetdb()
Finished Settings.class
Strings Ergänzung
commit model classes and create class
Added some delete Methods to Database
Merge branch 'master' of ssh://git@github.com/BenediktBeuttler/dhbwApp.git
Merge branch 'master' of ssh://git@github.com/BenediktBeuttler/dhbwApp.git
changes in model classes and create class
Merge branch 'master' of ssh://git@github.com/BenediktBeuttler/dhbwApp.git
Added getters to Runthrough
changes in create class
help menu layouts
Stack and create class
Merge branch 'master' of ssh://git@github.com/BenediktBeuttler/dhbwApp.git
test
changes in create class and new edit class
Add Documentation
Merge pull request #53 from haria02/master

Add Documentation
Add access control
Merge pull request #57 from haria02/master

Add access control
Load memo list when click memo tab
Load memo list when click memo tab
Merge pull request #58 from haria02/master

Call load function when memo tab is clicked
Fix memo viewer
Merge pull request #59 from haria02/master

Fix memo viewer
Add message on top page
Merge pull request #60 from haria02/master

Add HTML on the top page
Merge pull request #4 from JAFB/master

Merge the latest code
remove apple only conditional code that is no longer needed.
add some more items that git should ignore. Side effects of setup.py build process
check for empty text before indexing
removed the site folder
personaltools move
footers
We are not using the modules.pp file
Move 'files' into metacpan module
Final Demoable code
separated classes for the essential tables
MolesSQLiteHelper handles the creation of the database
enable interactive and conservative governors
Plus besoin des model, changement du usercontrol
sodaDisplay compiles now too ;D
upgrade deps for kryo 2.16.
Merge pull request #5 from Cascading/feature/kryo_upgrade

Upgrade Kryo to 2.16.
Disabling triggers is causing deadlocks in production, we instead using a magic user_id
Built my first package
Refactoring per section 4.1
[15891] Other/Checksum: 7b0bd745b50266841ed6d5a12ed92713

Signed-off-by: Pascal Vahlberg <pascalvahlberg@yahoo.de>
comment Linter specs.
Added IOHelper.GetUniqueFilePath method
Content in client
Cinbte
Initial composer files & Directory::rrdir()
Added .gitignore file
all find methods do sort in the same way
typo
find  default to array() for DSWebAPI and sanity
Merge pull request #1 from Cumula/feature/sort-for-all

all find methods do sort in the same way
More Infomation-Containing README
Muffy status icons theme was added.
Keeps reprocessing images
Streamlined adding of results
Added empty files
Merge branch 'master' of github.com:DLindbom/PHP-boilerplate
switch to DNA-ROM manifest
Commit inicial
Añadido bootstrap
Se especifica que el documento es HTML5, requisito de Bootstrap
Añadido el estilo polaroid a los thumbnails.
Añadido botón de descarga en la imágen 12
Merge branch 'master' of https://github.com/DPini/wallpapers-webpage
Add final blog post
Fixed possible casting error from jinternalframe to jmapframe on the toolbar components
renamed project folder "lib" to "External JARs"
Created and utilized rough cmu-based suffix graphone dictionary
removing sample env for site.
Delete files
delete
gitignore
added date handling... almost
Init Text Editor js
add xml editor
add activation table
add support for <note> <space> <gap> in preview
- Fixed #93 - Create and name a new folder (with right click)
- Some code optimizations
First pass at the simple interface
Fixed to work with google calendar api
Merge branch 'google_lib_add' into develop
nettoyage application.rb
Testando hook com erro de teste de unidade
check if a document is open
Signed-off-by: Endis <369029432@qq.com>
南充分拣信息系统
added option 'angleBgCircle' || default = false

'angleBgCircle' show a full circle background when 'angleArc' is less
than 360 degrees.

fixed a problem with 'configure' when an 'angleOffset' was previously
difined
added 'angleOffset' + 'angleArc' example
Also highlight the "comment" key in global scope
Consider numerous edge cases (especially in flow style, the JSON-like)
clarified dox for RealGalaxy to say that it contains an SBProfile attribute, per discussion on #257.
(#257_2)
Move try/except block for scipy from Da function into test that uses it.
Replace Moffat maxK test with correct value.
(#44_photons)
(#280) Used underscore to make it clearer that get_index_for_id is an internal function, stressed that in docstring too, updated call in base.py
added information about tagged versions to docs/git.txt
added information on tagged versions to README
modified readnoise > read_noise in CCDNoise class kwarg
remove tabs
(#243)
Added copious comments to the configuration stuff and intermixed the two styles somewhat.
(#103)
HELL!!!
Fixed map rendering error again
fixed property alpha ordering.
max credit card per publisher
Updated cap deploy:
Fixed a bunch of unit tests and corresponding code
memory leak from Particle Effects fix
trying to make labeling work
JDK6 compliant code changes (no inference).
JDK6 compliant code changes (no inference).
修改menustate
Merge branch 'master' of git://github.com/EternalWind/The-Dark-Crystal

Conflicts:
	src/main/MenuState.cpp
Updates

!. Calls Node::onUpdate for Crystal, Alien and Monster.
2. Calls Entity::onInitialize and Entity::onDeinitialize for Alien.
3. Fixed a moving problem for Alien.
4. Modified Detailed Class Diagram.
Merge branch 'master' of github.com:EternalWind/The-Dark-Crystal

Conflicts:
	src/main/Monster.cpp
Merge pull request #72 from JIANGJZ/master

修改了Configuration增加QASetting
Merge pull request #71 from LiuJack/master

修改menustate
更改各种代码。。。
HumanAgent completed!

1. Completed HumanAgent.
2. Fixed the name for mSensitivity and its getter and setter.
3. Changed the type of ControlSetting::mSensitivity to float.
Merge pull request #73 from aeronzhou/master

更改各种代码。。。
乱码-_-
Merge pull request #75 from aeronzhou/master

欢乐改乱码！达咩，欧尼酱~~~2个字的乱码也要改啊~~~
Merge pull request #76 from JIANGJZ/master

QASetting 注释
Signed-off-by: JIANGJIAZHI <15920547708@139.com>
Working on serialization of model and mesh
"Save Adventure" link opens in new window

This is useful for browsers that don't yet support the "download"
attribute.
Horizontally centered theater instructions
Save link does not wrap
Saved file has same name as loaded file
Name and hotkey tweaks
Merge branch 'file-handling'

Conflicts:
	common.css
add compression config
compress config
versuch/ansatz die steuerung einzubauen...
neues tileset ist nutzbar

die abfrage nach den pixelfarben hat sich geändert. es können viel mehr
tiles eingebunden werden
created 2 folders for sounds and maps. moved defaultmap position to maps. changed filepathway in program to call the map. Added sound files
Phase 1 of adding DirectInput logic to Game Utilities
Video Node Template
Added Scala import settings.
Merge pull request #35 from Josso/master

Remove dependency of macauthlib
Clean up our DIY MAC Authentication code
Convert dict update methods into dict element access using []
Add before_id_entity and since_... to docstring for getPosts
Renamed import files
added seperat (magnet) bearing
jquery
Fix tabs/spaces
merged
Merge branch 'integration' of github.com:Julek/Nature--code4good- into integration
Merge branch 'frontgui' of github.com:Julek/Nature--code4good- into frontgui
Merge branch 'integration' of github.com:Julek/Nature--code4good- into integration
changed tag
Merge branch 'integration' of github.com:Julek/Nature--code4good- into integration
merged with shahin's changes
updated Geonode
Merge branch 'integration' of github.com:Julek/Nature--code4good- into integration
Merge branch 'frontgui' of github.com:Julek/Nature--code4good- into frontgui
merged with integration changes
geo node
Merge branch 'integration' of github.com:Julek/Nature--code4good- into integration
nothing to do here
niklas is romanian
google maps
Merge branch 'integration' of github.com:Julek/Nature--code4good- into frontgui
Fixed player prefab across both levels
Mms: Updated czech translation

Change-Id: I1a5a58a90314c17c5814c6802bfd1ea0b757ca5f
Signed-off-by: Petr Reznicek <kecinzer@gmail.com>
Merge remote-tracking branch 'upstream/jb' into jb
Mudando pra variar detector e descriptor
Update README.md
Update README.md
Update README.md
Update README.md
Update README.md
Update README.md
Update README.md
Merge https://github.com/okdshin/RollCake
Setup to run with non trivial states
добвлено перечитование hex файла перед прошивкой
added monkey patch to add ids
Remove Master Prebuilts Repos
减慢变化速率
agrego step Given se inicio una nueva partida en definirTablero.rb
* Add filter "wplinb-match-wp-debug"
* Add filter "wplinb-enabled"
Even MORE functions (yay)
implementing reads
Signed-off-by: moseshi <moseshi@gmail.com>
Merge branch 'master' of https://github.com/MahjongGroup/MahjongJava.git

Conflicts:
	src/mahjong/system/Field.java

Signed-off-by: moseshi <moseshi@gmail.com>
Updated VSync.................    Bitches!   =P
[finkelsc] Integration JQuery Components
[finkelsc] Integration JQuery Script-Tags
added some fancy to pseudocode, now you have to make the latex document at least twice! added latexmk to makefile
Further specify graph coloring problems
Add formal definitions of eulerian and hamiltonian cycle
Add reminder for the notion of strongly connected graphs
Merge pull request #2 from MaxWagner/master

Minor additions
First part of EXTJS 4.1.x
remove .gitmodules
Moved the open x transfer to the user entity (pre persist)
Fix Opencv 2.1 compatibility
more robust continued entries parsing
xfce: conky offset&battery update interval; desktop background
Added numero sign
Only fix ssl security if the OS version is affected by the bug
built-targets: resort alphabetically

Change-Id: Iaa5551cb38c014a04bb21290cc1cabd010b5aee2
apns-conf-cdma: Remove Sprint CDMA MMS apn, conflicts with LTE/eHRPD service

The old Sprint CDMA MMS apn uses the same MCC/MNC pair (310120) and apn
type ("default") as Sprint's LTE/eHRPD service.  Thus, Sprint LTE devices
attempt to connect to LTE/eHRPD services using the old CDMA MMS apn first,
which usually fails, and thus delays service establishment.

However, occasionally service "successfully" connects with the CDMA MMS
apn, for unknown reasons, at which point that apn is set as the preferred
apn for LTE connections.  Thus, any subsequent LTE/eHRPD connection attempt
fails due to use of the wrong apn.

By removing the old CDMA MMS apn, LTE/eHRPD connections will use the
appropriate apns.  Furthermore
com.android.mms.transaction.TransactionSettings::TransactionSettings does
not query the bearer field when looking for valid MMS apns, so the
LTE/eHRPD will continue to work on non-LTE Sprint devices.

Note that with this change, the MMS apn now specifies an mmsproxy.

Change-Id: Iba48bd6d120b02bc6265f958d0e04181d17f5c66
cm vendor: add tf700t to jenkins-build-targets

Change-Id: I59bc3862215ec62f56b32310758065e0bf090005
Merge branch 'jellybean' into MiniCM10
misc/sources.list.lmde: Add sources.list for Linux Mint Debian Edition.
fix issue #1719 and update ip address length on captcha helper

Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
Simplification in Text Helper's character_limiter()

Because the "\s" regex character class includes \r and \n,
there is no need for the str_replace() part
Slightly robuster test

Also, single quotes per style conventions
Added Calendar library unit test
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into codeigniter/develop
Fixed issues #1756 and #1711

Signed-off-by: dchill42 <dchill42@gmail.com>
That doesn't go there. Put cache fix around correct query.

Signed-off-by: dchill42 <dchill42@gmail.com>
Add documation to user guide for Migrations class
More complicated but faster method

Also added a comment to explain the reason for such a complicated method
Merge pull request #1750 from vlakoff/develop

Simplification in Text Helper's character_limiter()
Merge pull request #1771 from pickupman/user_guide-migrations

Add documation to user guide for Migrations class
Merge pull request #1770 from dchill42/session

Session Fixes for #1711 and #1756
Cleanup and optimize new Session classes
Misc. style changes
Database display error supporting "Loader.php" and "MY_Loader.php"
Check for "Loader" in $call['class'] instead of $call['file']
Merge pull request #1760 from vlakoff/develop-2

Better old captcha image test
Merge pull request #1776 from eweap/db-display-error

Database display error supporting "Loader.php" and "MY_Loader.php"
Merge pull request #1720 from appleboy/doc

fix issue #1719 and update ip address length on captcha helper
Removed the &nbsp; from the default config variables in the pagination class. Fixes #187 and #208

Signed-off-by: Alex Bilbie <alex@alexbilbie.com>
Optimized colorization code
주석 추강
remove contact link reference from spec #2088
Revert "Use BUNDLE_GEMFILE to set up Bundler in sidekiq.sh."

This reverts commit ed822918bd89a9e4792f578181aab3b09ab89d70.

This isn't working on our app servers.  Until I figure out why, I'd
rather not fix a potential issue by causing a real one.
major bugfix release and enhancements to ui
major bugfix release and enhancements to ui
major bugfix release and enhancements to ui
urls.py
Fixed conflicted from original project
removed hardcoded API and added parameters to BB object to customize API calls, cleaned core funcs out of bigboard_mobile and put them in bigboard_mainloop
changed renderers for floating layers
merging with upstream
Merge remote-tracking branch 'upstream/master'
widgets
Bump benchtester
Fixup the mozconfig used on albus. Probably shouldn't be in the repo to begin with.
Bugfix at watchlist/check/detail service
fix Duplicate definition in quota.pp

fix the Duplicate definition: Nova_config[reservation_expire] in quota.pp
added jquery ability to "add another" in table
add emtry category controller
delete sub images
Fix: old room was no longer removed during merge

This bug was introduced when I refactored Theatre to use Multi.
Multi now calls the remove method on its elements when it removes them,
if the method is available.
Lover faces room while waiting
Removed blacklist user testing for now
Set up fast zoom on the image #95
Merge pull request #104 from abbaco/master

Set up fast zoom on the image #95
Update decompose_license to use #find method
New users and .jshintrc
no preset user credentials in Login + clearing those entered after login
or registration
better clear all of them everytime
this takes care of updating a user profile. more or less.
added validations and migration
Update lua/renatus/core/quickmenu.lua
improved save
Merge branch 'master' of https://github.com/RHoKPrague2012/Frutiboys
Updated AvatarURL data type.
reverted cfa9aa3e9173b3fe4ea1e701c71dbcaf67254a63 as it caused to not package the required external dependencies for the imdb and tmdb plugins
moved the maven-external-dependency-plugin part contained in the core to the root pom to avoid build issues even though its not where they belong. See http://code.google.com/p/maven-external-dependency-plugin/issues/detail?id=8#c3
Merge remote-tracking branch 'pms/master'

Conflicts:
	pom.xml
	src/main/java/net/pms/messages.properties
removed the now unused pluginExecution in core/pom.xml
Corrected resource name.
Filter only *.properties files
Shutdown plugin fixes
default end emits finish
0.1.1
Sometimes only 3 tests fail
Fixed some things
quick template
javascript rocks
multiple tours
try new ssh
Name: Kendrick-btmanh.65
Author: btmanh
Time: 14 September 2012, 2:27:55.067 pm
UUID: fa392bdd-0806-9145-bf60-6f7165a757a0
Ancestors: Kendrick-btmanh.64

Modify the code of algorithm individuals based.
spatialite-gis: Depends on libharu
commit delete 1111111
Comments
VariantValue: Comments, cleanups, and new Equals() function. A few private
name changes.
Add urls for each slide
Filetype speedups and tests

* eliminate an S3 round-trip for filetype lookup
* make icon assignment a constant-time operation
* rename .file_icon() to .get_icon_type() to make its behavior more
  explicit
* rename .file_ext() to .get_ext()
* Adds unit test
Merge pull request #1346 from Stanford-Online/jrbl-1334-sprint22-hotfix3-filetype-speedup-production

Filetype speedups and tests (prod - really now)
Amy created some text for class2go.stanford.edu
Re-indented WebcamRecorder.as
Bundled as3corelib
Popup privacy settings at startup
Set up the version for 08/25/2012 and update changelog
assuming the current_server is_remote changes goes it...
yay, this is basically what i am after - a create task that can be magically run on a magically created vm
Update 0.3
backstab and poison now works with bow & arrow
configurable hookitem
cancel interact event to prevent block placement
Modify style.css
Remove width for main
Add min-width and max-width for main
Added compilelog for debuging purposes
Patch do tajmera #3 (opozniony start) + maly clean-up
clean up and making things consistent
Working L3GD20 sensor implementation
Fix unit of stack current in C/C++ example
Add Delphi example
uploads renamed to media
added ie css for ie button
added feedback
Added makepkg-elseware script.
Fixed syntax error in xinitrc, updated rc.lua to support alternate volume key.
Fixed xinitrc, updated rc.lua with alternate volume keybinding and created better menus.
Fixed xinitrc, updated rc.lua with alternate volume keybinding and created better menus.
Track OAuthRequestTokenTask and TraktTask failures.
Don't recommend to disconnect GetGlue if there is an error.
First commit after switched branch to master
Merge pull request #12 from Cegaiel/Windows_Arranger_Update

Windows arranger update
Resolvendo o nestedException ainda
Made FloorplanPanel clear when set to a null game state
Continuation of commit 4ab272e
Complete - task : Services / Bradcasts 
Tag 5 abgeschlossen
Merge branch 'tag_5'
Site updated at 2012-11-07 05:40:12 UTC
DO NOT PULL THIS COMMIT TO CURRENT PRODUCTION SITE! This commit converts the current site to legacy.wormbase.org; it's fully self-contained, with gbrowse integrated
Example of non-solid blocks ( hope I did it right -> edited in github.com ... )
Add an icons
Disable kitchen mode
New method - decompile - added to canvas

Returns a string that is the list of coordinates clicked on the canvas.
These points will be used to render annotation rectangles on the scan
Added comments to datareader.py.
Step/Run/&c. works. Plants grow.
Critters don't obliterate plants
Signed-off-by: Harrison W. Houghton '16 <haro@haro-Satellite-P740D.(none)>
working on quicktutorial
BUG: Installer templates

Installer was feeing the title "Title" to the template. Template
rearranged for usability concerns (people were missing the email and
password when going to the CMS login page)
melhoras no texto
Whitespace only
Added less file to project output
quantal package build
make story map entities fieldable
Signed-off-by: August Andren <aggeandren@gmail.com>
updated pointers to reflect active state or not
fix search for cabal

Signed-off-by: Alexander Dorofeev <aka.spin@gmail.com>
updated maven compiler to java 7 and fixed jersey dependencies
initial implementation for TweetSet#filter, filter0 and NonEmpty#filter0
arreglado algunos pequeños fallos
cambios menores
Stopped treating every columns summary as a pie-chart.
Better display of constraints
Much better functioning of filter dialogues.
Attempted fix for tooltip persistence bug
pool.py now uses mse_particle_filter so as to not fry the server
change some verion
Created 2012-07-03-this-works.md
Make Repository API lookups work again for the Image plug-in's imageSource attribute.
Merge pull request #757 from wimleers/dev-fix-image-source-attribute-repository-api

Make Repository API lookups work again for the Image plug-in's imageSource
add footer
add text
add a link
add organisation field
changed
willUMarryMe
fixed the rating problem all designs verified

need to change size 5 to 7.5 and 15 to 12.5
Blog testing/CV
Added license and just a bit of infos.
admin signOn
remove trailing newline from readme
Update CSV for 0.34.09
Reset for v0.34.10
Find linux offsets.
Define a metaclass to check subclass consistency
using is_arp
Remove unused element in notification
Bitmaps.border now accepts setStroke arguments
SPARSE-179 update pom <version> to 1.5.1-SNAPSHOT
Added comments, moved some comments. Didn't change anything important.
Docs for the PlaycountSync extensions.
Added the LovedSync extension.
Fixed a little bug on the settings_changed method that would reload all
enabled plugins.
Implement reading username/pw from Database
Site updated at 2012-12-23 21:10:09 UTC
try being a little less crazy with uglifier
Add a class name based on the platform to the body element.
Add info on how to deploy the App to the README
Initial work on Android styling.
Always expand the cover photo (on iOS too) because it looks better.
Less margins, less shadows, no border-radius. There you go, Android!
Move the icon to the header and adjust the header transition for Android
Remove headerChange event.
Add "Platform" module.
Header Icons and style fixes.
Detail view fixes.
Readme update for linux
Update Footer styles for Android.
added a file with valid points to be printed if needed
Change in general filter.
Add distinct for m2m.
Add details to package
Add simple ebuild view
Updated words and README
DataServiceProvider without context
union and his friends
Send app and request/response context to controller method on
invokation.
Fix mm for symlink projects
maybe this will align?
Fresh Website
Now able to specify an export path
Now able to specify an export path
added unicorn recipe
working z buffer values :)
Fixed "<link/>" tag.
added feed title metabox to xsmke posts
async trial
VERTX, DIE !
now in GRAILS 2.0.3 !!!!
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	web/css/bootstrap/bootstrap.less
Fixing up the home pages along with Naga
Merge the changes from program-ShortVersion
Fixed inclusion of r feature in discovery ui.

Solves bug 3269
Updated icons and removed opentox ds from installable features

opentox ds is found in install ds models dialog instead
Site updated at 2012-10-25 01:47:49 UTC
Wider reader.
Site updated at 2012-11-20 18:02:58 UTC
Fix latest row issue.
Prettier printing of @timeit.
secund try
Added a theme for a yellowish background
removing extra triangle being generated leading to segfault in deep subdiv step
Agile Standards post
re-sending token
Merge remote-tracking branch 'origin'
Load tinymce after taminations
Add 3/4 lines to formations
Start work on using tiny_mce
return
basic MapModel, app.js
initial map style
esri 3.1
cdn packages
amd versions of backbone & underscore libs

using James Burke's underscore and backbone forks with AMD support.
https://github.com/amdjs/backbone
https://github.com/amdjs/underscore
Update the other command in the README – should be good to go now
Updating the README, gitignore, and removing the obj dir.
Fixed homepage typo :)
Merge pull request #4 from patcon/patch-1

Fixed homepage typo :)
Changed "demo" to "build".
show and new views w testing
spec submission changes
resolved conflict
done styling profile page, added url validations
Merge pull request #16 from brickthorn/profile

done styling profile page, added url validations
Merge branch 'master' into reviews
removed sign out
add some usages

Signed-off-by: brucechen <brucechenofnju@gmail.com>
adicionei o lex-yacc em python. PLY.
Arena team now takes in an object as a parameter.  Instead of requiring the user to pass in the team size, an object has been provided to set the team size in the paramaeter object.
added disposed method for vector and improved const-correctness
Lockerz parser
xss tests
frameworks/base - update graphicbuffermapper to work correctly with Exynos4210 devices

Change-Id: I1cbf8e921032cc1f39e8d1c5cce02601f3d45eae
Merge "frameworks/base - update graphicbuffermapper to work correctly with Exynos4210 devices" into ics
Fix power menu reboot selection bug

To manifest the bug: Press and hold Power to bring up the
power menu -> tap Reboot -> select Recovery -> select Reboot -> Ok
Expected: Normal reboot
Exhibited: Reboot into recovery

Change-Id: I822c374230787550a753396b91aa884fe6450326
Telephony: Handle Data Call List

* Check call status before validating data call state
* Remove duplicates from the list of data calls
* Add RIL_UNSOL_DATA_NETWORK_STATE_CHANGED string to RIL

Change-Id: Iea75053cb8226ec15d2a2c11a73332e5ebe8c793
Telephony: Add DORMANT state to GSM data link activity

GsmDataConnectionTracker sets its activity flag to DORMANT and notifies
LinkActivity when RIL indicates that all its data calls are in
dormant state (i.e. active is set to 1 in UNSOL_DATA_CALL_LIST_CHANGED
message for all data calls)

CRs-Fixed: 332606
(cherry picked from commit 6b57c3b68d989d6b8f114c5f87dac6fc2c13a5f5)

Change-Id: I1d4b9fd24c4049a938d62f08b7720d47400ad7e1
Telephony: Optimizations on alarms used

* Use non wakeup alarms for data stall detection
* Stop data stall alarms during dormancy

CRs-Fixed: 334349
(cherry picked from commit 3512da1c22a8bdb82d633b93a6f2de608f1b4b08)

Change-Id: I2a7654d7cf888d63bf3862d33f126218c409ffd4
QualcommRIL: Update getDataState override

Verification of the dataCall.active status was added to the RIL super
class in change Iea75053cb8226ec15d2a2c11a73332e5ebe8c793, so we can
now fall back to it

Change-Id: Ib04057ec09549c0c79a4e4e1d89e2aa480e1890f
Merge "Fix power menu reboot selection bug" into ics
Merge remote-tracking branch 'upstream/ics' into gn
change xgmls parser
change beat rendererr
SocketReceiver.cpp
Provisional implementation
add by nakagawa

---fix point---
socket receive loop process
Changes npm project name again
re-include file accidentally removed

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
Added models for machines. Final 1.2.5 update!
forgot to use send -____-
Edit profile name
Generated models: user, institution, venue, post
Alterações nas dependências
Merge branch 'master' of https://github.com/candidosales/querocarona
Just a small formatting thing
Merge branch 'master' of github.com:canonical-hackers/marvin
Use ARQ spi to modify the war.
rewrite to www.-version by default
removed some PHP Warnings and noticeses for "undefined index"
minor changes to default styles
rewrite to www.-version by default
updated to jQuery Version 1.8.1
moved to separate folder, to load this only if needed and not by default
moved to separate folder, to to not load this by default
deleted win preview file
fixed some 404 errors in IE while loading corner-images
added this to default package
updated german translations for some slugs
moved to this separate folder, to not load templates by default
added a fn to add a CSS class to linked images, inserted via TinyMCE
removed the links to a "new link" and "new post" if theese features are not used
correction on cbstdsys body_class filters
Site updated at 2012-05-24 22:48:20 UTC
[maven-release-plugin] prepare release celements-core-1.21
fixed zoomEnabled behavior
Make point layer queryable for identify
just include the lecture slides, much easier than taking notes
Merge branch 'master' of git@github.com:chazelton331/algorithmsI
mods can now delete posts and topics
deleting stuff
Merge pull request #5 from christofian/master

The ability to delete posts has been added!
indexedDB support added, options object separated(it's methods still need work...), other...
Add page image URL
Add functionality to extract all images from page
Improve image extractor. Add to tests.
Merge pull request #3 from chrisalexander/pageimage

Pageimage
add compile step
Update dta.py

Corrected the distance penalty kernel to now incorporate the pass/fail distance threshold. Previously the penalty was too high - now the algorithm is more passing.
bugfix: onedsinusoidfit has wrong phase range
Update social bar and images
Temporary commit

Change-Id: I1c9482a5faae82efe67422fac08d9df0520639f5
let us never speak of layers again
style container
Fix postgres connection instructions.

Signed-off-by: Giorgos <giorgos.lamprianidis@gmail.com>
teeny tiny commit
BIG UPDATE.
Merge remote-tracking branch 'colindean/antiharass'
Cleaning up style to make Policies page fit under the updated Conference page
Merge remote-tracking branch 'carol/master'

Conflicts:
	config.ru
	public/css/style.css

* Added all sites to config.ru (conflict was with 'policies.html')
* Handled simple confict with CSS
Adding simple README
Fixing local link
Update README.md
Updating README with local development and contribution instructions
Adding the push step for user contribution
Updating main content style to work better with text
Changing h3's to h2's and capitalizing
Adding content for The Conference page
Correcting grammar
Another minor grammar correction
Re-arranging image on conference page
Updated speakers and format description
Updating sponsor page
Tweaking headers
Adding design assets
Changing body background back to black for short pages
Forcing min width to fix background clipping
Now reads cipher text line-by-line (arguments could be made that that's a terrible idea, open to suggestions) and reads from STDIN.
bump
TextFormatting
report on non-investigation materials

this adds a test for these types of materials
and hides the report button for resource pages and certain external activities
it also fixes a bug in the reporting on pages
Cleaned up settings; removed uneeded apps from installed apps.
Fixed bug; removed org from admin.
Merge branch 'tasks/CHRON-8/CHRON-28' of bones:chronos.io into staging
[backend] fix status of unresolvable preinstall images
[webui] one sprite to rule them all
documentation: requirements
Ubuntu Mirror layout
cg-metadata-helper package
more accurate usage printout for cbstats-json
initial commit
test
deleting test
first checkin
Merge branch 'master' of github.com:cpiantrain/letter-ladder
Replaced "first and last" summary with a listing of all "missing" Datasets.  Bootstrap-ized the formatting.
Change the jQuery version to 1.8 to 1.7. Problem with jQuery UI 1.8 and jQuery 1.8
Change jQuery version
Merge branch 'master' of git://github.com/got5/tapestry5-jquery