labofsahil/github-event-dataset-2012 huggingface dataset:
Testing commits to see how merge works
Merge branch 'master' of https://github.com/nonami/entrepreneurslinks

Conflicts:
	_inc/class.php
	_inc/connections_class.php
	_inc/header.php
	_inc/inside.php
	_inc/leftside.php
	_inc/notifications_class.php
	_inc/search.php
	config/config.php
	index.php
	profile_pictures/2.jpg
	scripts/jquery.js

Signed-off-by: nonami <nonami@ubuntu.mpjay>
multiple bugfixes and responsive CSS

IE8 and below fix, date conversion logic update
patched few more from 3/9
added final content
major refactoring of ExtensionMethods and import into FluentSharp APIs the extra ExtensionMethods developed at the O2.Platform.Scripts files
v0.3 Give players a tiny fall on join, stops the location check bugging them
v0.3 Removed some debugging code (oops)
v0.3 Players are now warned three times before being banned
v0.3 Updated readme to match new limits and checks
v0.4 Use a better method for high frequency command detection
v0.4 Use a whitelist of commands rather than a blacklist, also automatically detect aliases
v0.4 Be clear that an admin didnt do the banning
v0.4 Prevent players from repeating the last message in chat
v0.4 Added a permission to make players exempt from the checks
v0.4 Fixed version number and added a missing line
Removed static
Deleted submodule properly
Added submodule back in
stop grey carousel style being overridden
Make sure some tmp files are deleted.
Better lshell filtering.
Deny known bots on some heavy URLs.
BOA: BOND.sh.txt is now in the subdirectory (Robert)
adapt serializing-test to not be working anymore
rewrote module selector
merge departures and arrivals search logic
compress FIFO timetable indexes
reuse arrays for identical consecutive entries in timetable index
incrementally compare index arrays instead of comparing with hop 0
remove conflicting (and apparently unnecessary) init-param

it seems that only one instance of each named init-param is used.
which one is used depends on the servlet container or some other detail.

JSON response generation can be enabled by adding a maven dependency on
jersey-json, and the package in the removed init-param does not
seem to provide this feature directly.
comment
Work on shared configuration XSD, XML
Spring-Integration
give ids
- ‘src/file-input/tttr_clib/main.os’
Modify set resolution function with version 1.9
changed title to permalink
fixed from controller file nameing
with Render
Fix font fallback and background color

Since I'm using a monospace web font I need to let it fall back to a system-installed monospace font instead a sans-serif one.

And the background was too white for my taste.

Signed-off-by: Patrick Kontschak <patrick.kontschak@gmail.com>
- zmieniony listener na powiekszenie okna i zalatwiona sprawa z kwadratem zaznaczaajacym oraz kuleczka przy powiekszaniu
- zrobione przez bolka podzialki
cleaned up related posts
Initial commit cnv detection
Merge branch 'master' of https://github.com/pathintegral/cnvdetection
De custom JButton painted kan nu tekst bevatten
Heel veel bugs eruit gehaald (als je bijvoorbeeld te snel van paneel
wisselde)
Je kan nu ook de library starten door alleen de database type te geven
TODO: Implement para-vagrant with boxes.json and Vagrantfile
Removed the CinderAwesomium.h file from the project, since it wasn't necessary.
Merge branch 'master' of https://github.com/paulhoux/Cinder-Awesomium
fixed watched overlays position
Merge branch 'master' of github.com:paulsalem/skin-refocusbig
Added twopoint and uniform crossover methods.
Installed shoulda and factory_girl.
Created unit tests for clients using test/unit.
Created fixtures.
added custom page controller and curator custom page (self designed)
Lösung für Übung 04 hinzugefügt
reload module after making changes
fix wording
better wording
fix NPE in resource graphs window
fix wording
better wording
Merge remote-tracking branch 'origin/1.10'
Revert "Test new commit"

This reverts commit dcff490411298831f090acba7cbe7c22a0961f5c.
Adding CSV outputs
made dom selectors more generic to allow refactoring
changed search id to match js
added user joined date
show 'none' if no other addresses found
added prefix to user
we do not destroy users, we ban them (to be implemented later)
changed button classes
refactored loading @user
cleaned up controller
cleaned whitespace
add ability to ban users or give admin priviledges
made admin and ban buttons more distinct when active
added edit link to show page
20 seed users is enough
Re-enable and document @Ignore'd tests

Documented why static nested test cases in the spring-test module are
ignored, explaining that such "TestCase classes are run manually by the
enclosing test class". Prior to the migration to Gradle (i.e., with
Spring Build), these tests would not have been picked up by the test
suite since they end with a "TestCase" suffix instead of "Test" or
"Tests".

Re-enabled HibernateMultiEntityManagerFactoryIntegrationTests.

For the remaining tests that were disabled as a result of the migration
to Gradle, comments have been added to the @Ignore declarations.

Issue: SPR-8116, SPR-9398
Update TODOs with new JIRA issue

Issue: SPR-8116, SPR-10074
Upgrade to JUnit 4.11

This commit upgrades the compile dependency on JUnit in the spring-test
module as well as the global test dependency on JUnit for the entire
test suite to 4.11 GA.

In addition, the spring-test module now depends on junit:junit instead
of junit:junit-dep since, as of JUnit 4.11, the "junit" Maven artifact
no longer inlines hamcrest-core.

Issue: SPR-10044
Update @ModelAttribute javadoc

The @ModelAttribute javadoc now explicitly mentions that model content
is not available after an Exception is raised. This is a very common
question given that @ExceptionHandler methods are co-located with
@ModelAttribute and @RequestMapping methods.

Issue: SPR-10071
Support comments in statements in JdbcTestUtils

Prior to this commit, executing an SQL script with JdbcTestUtils would
fail if a statement in the script contained a line comment within the
statement.

This commit ensures that standard SQL comments (i.e., any text beginning
with two hyphens and extending to the end of the line) are properly
omitted from the statement before executing it.

In addition, multiple adjacent whitespace characters within a statement
but outside a literal are now collapsed into a single space.

Issue: SPR-9982
Support comments in statements in RDbPopulator

Prior to this commit, executing an SQL script via
ResourceDatabasePopulator would fail if a statement in the script
contained a line comment within the statement.

This commit ensures that standard SQL comments (i.e., any text beginning
with two hyphens and extending to the end of the line) are properly
omitted from the statement before executing it.

In addition, multiple adjacent whitespace characters within a statement,
but outside a literal, are now collapsed into a single space.

Issue: SPR-10075
Update changelog re: comments in SQL statements

Issue: SPR-9982, SPR-10075
ConfigurationClassPostProcessor consistently uses ClassLoader, not loading core JDK classes via ASM

Issue: SPR-10058
Removed coverage of deprecated java.util.Timer support

Issue: SPR-10050
Remove Spring Security sample tests in spring-test-mvc

Those tests as well as Spring Hateoas tests will be added to respective
projects instead.
Replace SLF4J with ACL TilesConfigurer for Tiles 3

Replace the use of SLF4J LoggerFactory and Logger classes with Apache
commons-logging LogFactory and Log.

Issue: SPR-10077
Hacking
Hacking
Correct isMockDataEqual when comparing { arr: [1] } with { arr: [] }
Viget is no longer at the beta subdomain
Code cleanup.
Merge pull request #21 from pedroigor/master

Code cleanup.
search for give.
Remember tank's last position
Revert "Temporary Revert "move more kss stuff to plone.app.kss""

This reverts commit 660dbabcecc10c1b75945bb3a0cb506121f5ea72.
evaluation script produces P-R graphs
del ready
BUGFIX utf-8
aggiustato il problema dato dai caratteri utf-8
regressione: la scissione di un elemento in due parti non funziona più bene...
Update dealroom.html

adding places
Result refactoring
Back to normal, no CGLIB
Removed dep
Merge pull request #35 from priyakanth024/splash_design

Splash design
lists creation still pending
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
added task_status switcher
added helper method to show task_status; added 'opened?', 'in_progress?', 'closed?' methods to task.
fixed issues; changed routes.
catch IndexError
Merge pull request #6 from progress-engine/i143-task-states

Task's state switcher
Merge remote-tracking branch 'origin/master' into i149-new-organization-and-task-forms
/ ‘Backup/child_sherrif-rig_B1/child_sherrif-rig.scn’
/ ‘Backup/child_sherrif-rig_B2/child_sherrif-rig.scn’
+ ‘Backup/child_sherrif-rig_B3/child_sherrif-rig.scn’
+ ‘Backup/child_sherrif-rig_B3/child_sherrif-rig.scntoc’
/ ‘Models/character/child_sherrif/child_sherrif-rig.scn’
Includes configuration parameters for Symfony2
md5 tag
Initial GUI commits
Ceylon IDE plugin settings changes
Added tag rabbitmq_v2_8_6 for changeset 49158b3d3ebb
added rotation for upside-down stairs
Added rebase_branches script
add newfile
modified readme
Adding twitter search api and conversion of data
Fixed some typos in tree.h.inl
Minor fixes

+ Add version string to help output
+ Replace tabs with spaces in help output
+ Fill in the lastStatus value in the pastebin struct in some
functions
+ Add debuggins symbols to pb_debug in Makefile
+ Fix memory leaks in pb_newPaste
Testing a possible fix for thread breaks.
Push all apt driving into a retryable loop.
- Add AptInstaller exception when we try to run apt and it fails.
- Retry logic abstracted away from where it's used.
- All apt commands get their own function to associate the retry
- Add test on wait_for_ssh
- Add test on apt_installs
Remove trailing whitespace
PT #28312545: tweak provision specs
standardized exiting when retries fail, fixed retry count, add provision fail specs
bump to 0.1.2
[NEW] init of the installation script for MacOSX
Download xz-compressed geoip databases if unxz is installed

Only the GeoLiteCity database is available xz-compressed for the time
being.
Drop trailing zeros in the coordinates

They are useless
Disable mirrors based on available master stamp per continent

The per-region "mirror subsets" feature.

There are some regions where it takes far longer to receive the
updates. With this change, if all the mirrors in a given continent are
behind the latest master stamp, they will not be disabled.

It needs additional work to take into consideration the following:
* There should be a limit as to how old the per-region stamp can be
allowed to be, compared to the master stamp.
* redir.pl is not yet aware of the subsets and may combine mirrors from
different subsets when doing a "nearby-continent" selection.
Update the documentation

There shouldn't have been such a grace period of time, at least the way
it was implemented, in the first place.
Print the per-continent master stamp
Print a nice report of how old the subsets are
Limit how old the subsets can be allowed to become

Hardcode a twelve-hours limit for now.
Do not allow security mirrors to age
Skip the stamp checks if there are stamps of less than 3 mirrors

If the mirrors to be checked were passed via --id and there were less
than 3 mirrors of each type, they would always end up being disabled.
Drop useless hash, only one key could be stored in its lifetime
Only set the global stamp once

Otherwise old mirrors could not be disabled in certain cases.
Merge branch 'subsets'
Require at least one ftpsync mirror in every subset

This prevents the feature introduced in 9acd5d from sending a user to
another subset only for the InRelease file. Which would lead to hash
mismatches.
Tidied up a test and published release 7
added vim swap files to .gitignore
fixed duplicated families and tasks bug
added the cdp_definition methods
removed getName() function: fix error rendering templateCode
renders input type text instead of select
- quick doc update
Script now downloads files. Done.
Add Log messages to test the app
Removing dependency on mongodb attribute
Version 1.1.0 -- added fetching ticket types
Updated gem version
Implemented cloning of children of Many-to-Many associations
Updated readme
Updated version
* Adicionada primeira versão da sessão de valores.
* Adicionada primeira versão da sessão de localização.
fixed tests for namespace changes
allow acces to mobile/desktop version via GET parameter (also for easier debugging)
mobile version: add link to settings and login
Quitado boton para agregar articulos
cosmetics: merge lyrics from file functions
Bundle ronin-support (edge) for fixes to Ronin::Path.
Moved Ronin::Bruteforcers out into ronin-bruteforcers.
Add some tests from Tornado
Rebase from 'release/pluginlib' @ version '1.9.8'
Generated debian files for quantal
Rebase from 'upstream' @ version '0.7.7'
Trophies feature file
removed namedtagify format; added namedalphadash instead
Version 0.9 - Nearly all the things is done, although it's working..

JP added TODO.txt on Dropbox for things needed fixing
arbitrary comparison first pass: grunt targets for add/remove
test tweaks, fixtures and fixes 'last run' mess-up
v0.2.0
Adding the nodeunit stylesheet
Add the vhost for the app on install
added validate url function
added testing for validate url
built replacing function
testing of replacing function
array totaling function added
testing of the array adding function
added function to change a string to a number
testing string to number function
cleaning up my files for new month
starting week one project
cleaned up the html
renamed my .js file
forgot i killed the default parameters function
fix ui

fixed ui css, now links will work on iPhone and i can load the other
playlists. updated javascript class css selecters
try cat product page
some minor mods.
[+] Test runner
Link to akka url.
Not just companies but also governments and publicly-funded bodies...
Added a twitter follow button to the community page.
Regen.
DOC: more improvements / fixes on the MinMaxScaler doc
Make default dev environment generic.
#80 - method order_by doesn't work correctly on datatables theme.
added aidanhs' 'q=' twice test
refactored to use structural check for JSON output
Added database for recent searches. Populated recent search tab with recent searches.

Signed-off-by: Kong Yang <kongyang80@gmail.com>
Fixed some bugs with recent search database.

Added recent search loading.

Signed-off-by: Kong Yang <kongyang80@gmail.com>
Added starred messages search.

Signed-off-by: Kong Yang <kongyang80@gmail.com>
Fixed crashing bug in fragment view.

Commented the controller test since it sometimes just hangs. Need to figure a better way to write Setup and TearDown.

Signed-off-by: Kong Yang <kongyang80@gmail.com>
Addressing an issue with using the parent option when multiple elements match the "base" matcher.
Minor formatting edit.
Cleanup patch provided in #233. Merging closes #233
it works and documentation added
s
quick-save
WPF integration and CommandLine parsing enhanced

Use of Invoke in XmppDebugger component when it's needed. WPF seems to
use a different thread to manage Winforms controls
GetOpt Usage string is more airy and CommandLine get a new UsageValue
which is displayed in the usage commandline sample as [/d=filePath]
modularized server a bit more, improved group theory pages, updated dependencies, updated utilities
merged commits
update for release, moving to backport
update keybind manager, config file.
Keybinds are now set in game, or from file.  Currently unused.
TODO--save config @ program exit.
Enabled keybind hooks.  Updated/cleanup gui code
Needs reworking to just check Keyboard.isKeyDown for continual repeat
use (good for all but ammo type/fire/mount)
Remove the extra clicks that were due to buttons being disabled.
Fix IE returning "false" for the disabled attribute in wclick
production requests all false
arnav/vinay : generate report in csv format .
first commit
removed readme
Merge https://github.com/shingokko/shingokko-testo
#1 Boolean
Corrección

Se corrigio el mostrar la descripción de los covers
Fixed a bug where the set start hour was only one digit wasn't being recognised by the regex.
Merge branch 'master' of git@github.com:silicontrip/movie_scripts
Initialbetankung CRUD-Stand
Test

Signed-off-by: Matthias Beer <silkslostsoul@hotmail.com>
Merge branch 'master' of github.com:silkslostsoul/Eventalizer
Linux 3.0.33

Changelog: http://www.kernel.org/pub/linux/kernel/v3.0/ChangeLog-3.0.33
IDEA-68331 Mouse 4/Mouse 5 button not detected (cherry picked from commit 40d01b6)
Merge remote branch 'origin/master'
SVN: correctly put URLs in file revisions when doing file history (used to put *next* version url) - for show diff
for show all affected: corrected logic for repository history case
IDEA-61092 Goto Class dialog is dismissed when the list of matched classes reduces and causes loss of mouse focus
Merge remote branch 'origin/master'
Android widgets
Merge remote-tracking branch 'origin/master'
EA-34812 - IOOBE: DocumentWindowImpl.a
EA-34788 - PIEAE: PsiDirectoryImpl.a
cleanup
reverted: inspector eye shows the fake tooltip always
File read operation fix
Merge remote-tracking branch 'origin/master'
expand util
IDEA-81370: Flex project structure: on deleting several libraries at once, only the first one is deleted from dependencies list
compilation
compilation
IDEA-83494 Provide a more convenient way to insert triple quotes for Groovy strings
IDEA-83197 Unused Method Parameters Are Not Greyed Out as in Java Files
revert incorrect UnusedDefInspection
add routing methods when a new one is declared
extend routing mechanism
add date to every response
split only once for headers
Added a world class that contains all objects and lights.
Fixed enemies behaving weird when chasing, added new AI features.
Hid the description text for now, as I'm not sure what exactly it's going to say
Added p to display.
Fixed colors. Closes #26
Adding multipliers to edu
Minor tweaks and edits.
Changed image sizes, made facebook and twitter shares work and restyled cross-tabs. WOO
Merge branch 'master' of github.com:sisiwei/DC-Count-for-Kids
Merge remote-tracking branch 'origin/master' into gh-pages
blææ
redoing the demo structure a bit
Small tweek to readme
Made the x11 example multi-binary.
Changed port names of cgain_core and recompiled.

Recompiled with sma-wideband/mlib_devel@88da838. Also fixed a bug
where the real and imaginary input ports of cgain_core were swapped.
Changed 12-bit quantizer to simply floor then truncate.

This block might eventually be removed as with 649db89.
added containment property to sortable, and tolerance property to play nice with the container
Fixed up .gitignore
Fixed up .gitignore part2
Restructured templates, now using custom template tags
komunikat o niezainstalowanym agencie gdy przychodzi pusty response
Ajout du switch de lang sur la route en cours
Jira task MOSYNC-2246 "Nested Layouts do not work on iOS"
Fixed wrap property for widgets.
Jira task MOSYNC-2306 "iOS implementation".
Created protocols for ListViewWidget and ListViewSectionWidget.
Started the implementation for resizing the ListViewItemWidget.
Jira task MOSYNC-2306 "iOS implementation".
Added new properties to the ListViewItemWidget on iOS runtime.
Removed LIST_VIEW_ITEM_MOVE and LIST_VIEW_ITEM_SHOW_REORDER_CONTROL idl constants.
Jira task MOSYNC-2303 "Wrapper modifications"
Removed MAW_LIST_VIEW_ITEM_MOVE  and MAW_LIST_VIEW_ITEM_SHOW_REORDER_CONTROL properties from NativeUI wrapper.
Merge remote-tracking branch 'github_sandbox_bogdan/listView' into listView
MOSYNC-2324: added widgets to modify the properties of the list view, current selected list view item and the section in focus; MOSYNC-2307: added the selection event, implemented the 'AllowSelection' property, added methods for item/section insert/remove
qa-latency: use defaultSampleRate; fix crash on single loops; change latency check limits; continue after a failed test; some alterations to printed messages.

git-svn-id: http://subversion.assembla.com/svn/portaudio/portaudio/trunk@1839 0f58301d-fd10-0410-b4af-bbb618454e57
Less intimidating messages
Changed the PSR sniff that checks EOF whitespace to just check if there is a newline at the end of the file. Plus moved it into the Generic standard.
Remove some dead code and additionally handle a case that wasn't handled.


git-svn-id: http://svn.asterisk.org/svn/asterisk/branches/1.8@377487 f38db490-d61c-443f-a65b-d21fe96a405b
Improve documentation by making all of the colors used readable,
no matter what the background color is.

Dark blue on a black background is unreadable, as is yellow on a
light background.  This patch turns on the bright attribute for
colors when on a dark background and turns *off* the bright
attribute when the -W command line option is used (indicating a
_light_ background).  This ensures that text is readable in both
cases.

Patch by: tilghman
Review: https://reviewboard.asterisk.org/r/2224


git-svn-id: http://svn.asterisk.org/svn/asterisk/branches/1.8@377509 f38db490-d61c-443f-a65b-d21fe96a405b
Provide build settings from stackmob-ios-sdkTests
Update support spec name to match docs
Switched to File::Find for step 2
fixed embedded list poly
Updated the changelist to allow selection of all instances of a model for the purpose of applying filters.
Version bump to 0.2.4
I'd broken transfer functionality. Appears fixed now.
Fixed 'Other Experiments' template display
Fixed modal display on public access error
Abstract toggle only shows up if characters > 100
Added a couple of model classes
upgrade
Merge pull request #25 from mikey179/master

upgrade
page title
color, axis, label format
add forms
making some meaningful headway into the Backbone layer
Portal text
Merge branch 'master' of github.com:superblockio/JustyVenture
Added the PLayable interface
搞定月供页
更新可贷金额详情页面
dataflow update-in-place
click event propagation fix
Add working scrolling video
Merge branch 'master' of github.com:ahal/taedium-slideshow
스플래시 로딩화면 간격 줄임 & 쓸데없는 코드 삭제
#4: corrections sur notifications + affichage de la console, reste à remplacer ~ par /tmp dans script
updated to detect CentOS correctly
Add OTA & Animation MAnager to build and Settings.apk
telephony: Add LG RIL for Qualcomm basebands with no sim status

Change-Id: Idf1f769ff654f881b00950ef51f7826e1a66c505

Conflicts:

	telephony/java/com/android/internal/telephony/LGEQualcommRIL.java
Nerfed absorbtion
Music files from mp3 to ogg.
Google example request functional
Fixed a very small glitch from a typo.
new type position and scale aproach
new type svg string
Add funnel page for NaNoWriMo service survey.
Add "Days until Camp NaNoWriMo" widget to the sidebar.
Add survey announcement to the homepage.
Fixed up the testrunner to restart properly. This was needed as it wasn't reloading the .py files between runs, meaning I couldn't just leave it open while coding to pass some tests.
Added basic comment detection
Am now (sanely) using tokenizer instead of going down that horrible regex path :)

Yucky code, but at least it has ok-ish principals.
Added descriptions of classes, including inheritance
Changed code for Log messages when server is stopped.
Merge pull request #58 from ido0w/master

Changed code for Log messages when server is stopped.
Deleted unused file.
Merge pull request #86 from ido0w/master

Deleted unused file.
added uftp configuration
Added data extraction from csv file - jm
Test RegisterDuino
Now can display a loot table
tetris muokattu processing-kelpoiseksi
{svc,usr}/README.textile: (m) update
Artist list and area map activity
Added queue display for all jobs
Refs #11
ajout de prix fonctionnel
Signed-off-by: trempenault <trempenault@gmail.com>
Merge branch 'master' of github.com:trempenault/Comparessence
added initial sass plugin
Updated template to be more requirejs friendly
small fix to template
Added new html files and blog directory
returning single flight default through list method
bumping version number
added need check for data.result
Merge pull request #23 from tstmedia/flight_defaulta

returning flight defaults as an object
added subseason test
Merge branch 'master' into standing_prefs
corrected routes and removed crud action wrappers on standings because they break everything
add team instance to model list
Added following gateways: beeline, interkassa, liqpay, robokassa, premium, qiwi, masterbank, euroset
fix robokassa test
added completions for trapeze ssh tool
Reverted old API path to old name.
initial properties gui
Added get_localized_timezone method to get the local time for an event
Added get_localized_timezone method to get the loval time according to user default timezone and host timezone
Improve Code accroding to PEP08
op method added to Uploadcare\File
Update to play stable
Remove homepage, use posts list for homepage
Update HelloWorld/HelloWorld/ViewController.m
init product api project
nothing changed - test if works on martins
finished appointmentpersonrole model
SharedConstants Added
move environment stuff
Add localtoc and globaltoc to the side panel
wescamp_client: automatic update of addon 'A_Rough_Life'
_checkVersion() uses first 2 digits of version number
HFS+ compressed files and extended attributes, with zlib
Added error handling mods and getu24 macro
Many minor fixups:
1. coding standards
2. istat, time=0 now avoids printing
3. istat, absent RSRC name does not try to print a null
4. error handling, concatenated error messages now separated by space
5. istat, control chars in filenames are now replaced, for printing.
6. istat, UTF16 filename is now robustly translated into UTF8
7. close_attr_file() is now called.
8. configure.ac -- now warns if zlib is missing.
Changed the name of the inf() function to zlib_inflate and
added a descriptive comment.  Moved DECMPFS_DISK_HEADER to
the hfs include file.  Removed a spurrious comment, and fixed the
line that it marked to be more accurate. Renamed attributeCounter to
attribute_counter, to adhere to the coding standards.
Added #ifdef HAVE_ZLIB directives so that TSK will build without zlib.  Consolidated copyright notices.
Added code to test the HFS+ compression flag.
changed boolean to unsigned char
Minor fixups to remove warnings, rename one function.
Attributes file index nodes can have one record.
Fixed stack corruption on 64 bit Intel
Merge remote-tracking branch 'upstream/master'
Final wrapup of changes to introduce extended attributes and compressed files for HFS+.  Includes merge of recent changes to the main branch of TSK, as well as some minor tweaks to the HFS+ code.
Merge branch 'master' of git://github.com/sleuthkit/sleuthkit
Fix compiler warning about uncompressed buffer signedness.
One last compiler warning.
Add flag to add layout files method to indicate if parent is fs
Merge https://github.com/sleuthkit/sleuthkit
Initial datamodel support for Layout Content objects
Merge github.com:adam-m/sleuthkit
Merge https://github.com/sleuthkit/sleuthkit
New translator for dhistory
Empty navigator glitch fixed
add vim-mode
Merge remote branch 'origin/master'
modify readme
Update resume/CNAME
jQuery.placeholder v1.5.0
add a null test on playlist insertion
YOLO_HIPSTER-1 #closed
bugfix, prompt was not passed down to TITokenField
HW2-3 Submission Candidate
Measure PSD together with power charge
Merge branch 'master' of https://github.com/yujinrobot/kobuki_desktop
added in Google Analytics tracking code
Universal H1 Weights
To Blog or Not To Blog
add one scala test for generating empty database
add one scala test for generating empty database
add scala test
rm
title重复
www.xici.net   keywords  添加完成
elong.com   mindmap    添加完毕
huoche.com  and  huoche.com.cn   mindmap  添加完毕
xici.net   mindmap  添加完毕
Merge branch 'master' of https://github.com/seoaqua/unit-test-seo
国际酒店思维导图补充链接,国家升级为第一层节点,与洲节点平行
国际酒店思维导图补充链接,国家升级为第一层节点,与洲节点平行
...
report sending addr
Merge branch 'master' of https://github.com/seoaqua/unit-test-seo
flight.elong.com  description 添加完毕
更正  hotel
。。忽略
修复引号错误引起的不兼容
未完成
flight  redirects  补�
忽略
globalhotel  redirects   补全
hotel   redirects
readme
101 over
put proxy server in a work thread

Signed-off-by: sphinxdwood <sphinxdwood@gmail.com>
change the logo , just uglier :D
Cleanup (pep8, pylint)
Fixed bug when referencing a template in the default template_group with a single segment.
Changed for testing
Added images and folder for frontpage
make note about how we use the 'framework'
31 may secret update
ios3 singleton fix
Merge branch 'leaderboards' of github.com:Applifier/applifier-mobile into leaderboards
working on ajax methods
roll 2.2
Construction des tables fixed.
Allow plugin installation
Readme Updates

Correct example for `acm_logical_operator` to actually use `acm_logical_operator` :)

Clean up some consistency across examples - if multiple lines are required, the function is brought outside of the filter. Correct a few syntax issues.
Added /list Command. Added Vault Support. Fixed missing register for tptoggle.
Bitmaps Updated.. 32Bit Only.
Refactored telephone, quantity, and credit card # form inputs to HTML5 form inputs
add new sps and update model
added bash syntax highlighting in markdown
Move gpu/msm_adreno220 and video/msm_8x60 back to respective locations
Update vidc

Change-Id: I0df830487bfcf5ac194ecd8047fc7277105d9443
Update ion allocator to jb_chocolate.
Update vidc headers

Change-Id: I9ee49d6ef343a4ec5f23fe403e299ae96b2eb032
Update iommu to jb_chocolate.
Update kgsl drivers to jb_chocolate.
msm: rotator: add downscale support in rotator

Rotator is capable of performing 1/2, 1/4 and 1/8 down scaling. Add
downscale_ratio parameter to provide support for this feature.

CRs-Fixed: 315874
Change-Id: I57dc3456ccc9bec2a125750b3e9909ffcbaf45f6
Signed-off-by: Adrian Salido-Moreno <adrianm@codeaurora.org>
msm: rotator: Fix rotator YCrCb planar formats unexpected output

Rotator expects planar input in YCbCr order, wrong color can be seen
on ouput image when given YCrCb because the chromninance planes picked
are not correct. Swap Cb and Cr plane addresses to output correct image.

Change-Id: Ia05ab704d18da4aac49e63fb805c40a95ea51a33
CRs-Fixed: 327956
Signed-off-by: Adrian Salido-Moreno <adrianm@codeaurora.org>
msm: rotator: Add bus scaling support

Add bus scaling support to rotator driver

Change-Id: I53faf6070a9dc6d6359b6d58cb7cb618217ee8c0
Signed-off-by: Nagamalleswararao Ganji <nganji@codeaurora.org>
msm: rotator: Add pseudo-planar output for interleaved format.

Rotator gives pseudo-planar H2V1 output for interleaved
H2V1 input format.

Change-Id: I2a7af3243dfb1175ea14d6649b4cec87029fec38
Signed-off-by: Mayank Chopra <makchopra@codeaurora.org>
msm: display: Add rotator bus scaling vectors for 8660/8960

Add rotator bus scaling vectors for 8660 & 8960 targets

Change-Id: I9590fff72a57687b110355e3862d5ac5cf61e0cc
Signed-off-by: Nagamalleswararao Ganji <nganji@codeaurora.org>

Conflicts:

	arch/arm/mach-msm/board-8960-display.c
	arch/arm/mach-msm/board-msm8x60.c
	arch/arm/mach-msm/devices-8960.c
	arch/arm/mach-msm/display/vigor-panel.c
msm_fb: display: add ioctl for mixer info

Add new ioctl to allow user to query mdp mixer detail configuration.

Signed-off-by: Kuogee Hsieh <khsieh@codeaurora.org>

Conflicts:
	drivers/video/msm/mdp4_overlay.c
	include/linux/msm_mdp.h
msm_fb: display: Fix color swap issues in MDP4 and Rotator drivers

Many of MDP input formats don't have correct unpack pattern, so image
displayed on screen is not in the actual format set. Also,Some rotator
output formats differ from input, these mappings used to be handled in
userspace, but to avoid issues this is now done in driver. For YCrCb planar
inputs chrominance order is dependent on rotator hardware version. Add
hardware check to swap Cb and Cr for 7x30 and 8x60 rotators.

CRs-fixed: 339114
CRs-fixed: 337040
Change-Id: I55691aa7c9d38e83e4fc63a162ffb23959ba30c1
Signed-off-by: Mayank Chopra <makchopra@codeaurora.org>

Conflicts:
	drivers/char/msm_rotator.c
	drivers/video/msm/mdp4_overlay.c
msm_fb: display: add YUV444 interleave format support to mdp

Add support for H1V1 interleave (YUV444) to mdp

Change-Id: I86b76831ad87dede90ddd8d8f5ae64e51fa28c27
Signed-off-by: Kyong Hwa Bae <kbae@codeaurora.org>
Signed-off-by: Adrian Salido-Moreno <adrianm@codeaurora.org>

Conflicts:
	drivers/video/msm/mdp4_overlay.c
video: mdp: add definition for YUV444
Adding taxes stream (more fields to come)
Merge pull request #162 from ChristianGiupponi/1.1/develop

Fix double currency
Added taxes view
Added taxes index method to controller
Adding extra tax stuff to language file.
Merge branch '1.1/develop' of https://github.com/firesale/FireSale into 1.1/develop
Fixing small issue with currency
Some updates to taxes including entry/edit form
Cheerio comments
Adding delete function to taxes
Adding tax band field to products
Tax name is now called tax title ;)
I see we're using coloured/colored buttons now
Fixing typos in gateway language keys
v 1.2 changes
game update add sounds
pre-passing confd
Ready review with pumazui
Obvious mix of = and ==

Change-Id: I52183924c287b80e9ca7c20df6edfe132b43e088
Compact merged dexes on their byte aligned size

Previously, if a merged dex had too much free space, the compaction step
would subtract the unused space from the section sizes generated by
adding the merged dexes section sizes. The merged sizes weren't 4-byte
aligned, which meant if a section had been bumped in size for the
boundary, the compaction would fail when loading into a section eg
'Section limit 3665072 exceeded by string data'.

This gets the compacted section size from the actual used space instead
of from the non-aligned estimate, so everything fits.

Change-Id: I1aee1abd721ec21998bb3ea78f6f424e7421b614
fix Issue 7858 - __traits(getOverloads) returns incorrect symbol
Merge pull request #869 from 9rnsr/fix7858

Issue 7858 - __traits(getOverloads) returns incorrect symbol
merge D2 pull #1155
default 64 bit libs
add front end support for 256 bit SIMD instructions
Fix build; Simplify code in GetFormattedName
Game specifications changed (pdf in portuguese)

Add used libs to readme.md and removed no longer needed notes
Proper includes in player.h/cpp
Go
Go
Merged
fix animation glitches on 3 models
Fixing issues with missing textures
Merge remote-tracking branch 'upstream/master'

Conflicts (Binaries that need to be ignored):
	Assembly-CSharp.pidb
	Assembly-UnityScript-firstpass.pidb
	Assets/Main.unity
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/cache/6f/6fbb34e2819a8fe45ab6a482a037bad1
	Library/guidmapper
	Library/previews/ba/baaa58501110118489b1ae48ee87e852
	Library/previews/ba/baaa58501110118489b1ae48ee87e852_/100030
Fixed all the merging issues. Ever. Hopefully.
git markdown seems broken, going to plain code blocks
Updated npm and node
Adding some caveman debugging
typo
Figured it out, I think
Changed formatting of output
IE: Agregando lista de paises y DATA en la DB
add feature to change product status
First Commit

Added all files to the Repo
Header Menu consistensy/customization, Debate page created

Fixed copy text and links in the header menu of sites, as well as
create a HTML document for the Debate layout to be created.

Also added native images to Art1.htmls Related Stories row.
Updated to work with cordova 2.1.0
Updated to work with cordova 2.1.0
Added more detail on funnel and cohort in readme
Update 000-1 map,
Add Yellow collision on 000-1 map, on the stairway to hea^W^W the ship.
Update whiteclouds randomness and remove some useless clouds,
Change warp location on 000-1 and add some trees to hide some collision lack.
Chef Gado quest. Dialogue's progress (WIP).
Fix Crocotree mob. Now it can be targeted by player from distance.
Wall collision re-enabled, mob's mode altered.
[Listener] Allow conditional indexing based on callback method

Added optional is_indexable_callback config param to persistence. If this is a method on the entity, the listener will only process it if the method returns true. Also updated documentation.
[Listener] Use common AbstractListenerTest for ORM and MongoDB ODM
[Listener] Support additional indexable callback types

Support service/method tuples as indexable callbacks. Closures are also supported, although they cannot be injected by the service container.

The indexable callback is now injected via a setter and validated when set (instead of during event processing).
[Listener] Revise is_indexable_callback documentation
Merge pull request #93 from Exercise/listener-check-method

Listener check method
Create dummy django settings file for sphinx
Little acceleration
first try at the bootstrap script

 On branch master

	modified:   development/bootstrap
[+TASK] Introduced a semaphore, so that concurrent data exports are prevented.
Merge branch 'dev/exportsemaphore' into next
i put the catch on the wrong function
make it a nice markdown Readme
virtualenv used to initialize .virtualenv, install Pygments
for the XZ decompressor

Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
demo添加高级代码编辑器
Site updated at 2012-03-27 20:50:10 UTC
testing the commit then push
added recent game files
Cleaned settings file

Removed Google analytics and copyright statement from settings to keep
this demo small and simple.
First draft: Generate random OAuth request tokens

Request tokens are generated and stored in the database.

The implementation is based on the `randomKey` function
defined in `yesod-auth/Yesod/Auth/Email.hs`
Refactoring after hlint suggestion
fix alias path
iPhone meta junk
Struts 2.3.7
Player texture UPDATE
added readme
Merge pull request #3 from danblundell/master

added Readme file
only delete files which stay at least 1 day in the thrash
Updated changelog
Removed System.Tray

* Removed it to make more room for content, and for easier to make the
app look ok in dark/light theme.
* Sadly it gives the "problem" right now, that the
globalprogressindicator isn't visible right now...have to find a
solution.
Added Io vim highlighting plugin
migrate to sqlalchemy declarative
moved to declarative note from interweb
A bit of clean up.

Im working on next step, building a new Abstract* subclass
Merge pull request #935 from Shephiroth/dev/AbstractScreen0.21

Dev/abstract screen0.21
Merge remote-tracking branch 'upstream/develop' into feature/tiledMaps
New file structure + very advanced app

Si toate variantele in format PDF
project_name string implemented EN_FeedbackUIStrings.lua
Create basic: directory structure, contact form, actions and view
Added Line3D example.
adding uncategorized into field
positioning uncategorized dragging onto the top of the page"
adding better dragging functionality
adding buttons for user to drag to
more progress towards dragging into horizontal
adding ajax features to the dragging process
added dragging from uncat functionality
more dragging meme from functionality
able to click newly dragged meme
blocking already noded memes
created block for vertical memes
bug fixes
backwards connections between nodes
disabled uncat when meme is currently selected
added message for user to know successful invitation
reintegrating value prop into tutorial
value prop part 2 integrated
dragging portion box
dragging now shows up a drop me box
positioning fix
Formatting
Implemented new onEntityExplode methods
Implemented AffectedBlockCount for explosion detection.  Added
AffecdBlockCountMax to config.
Updating README with basics of building a MN OSM map.
Updating README.
Fixed rendering order.
Adding script support
Merge branch 'rewrite_add_edges' of https://github.com/cwabbott0/fun_with_graphs into rewrite_add_edges
Update graph.c
Merge branch 'rewrite_add_edges' of git://github.com/huangkevin57/fun_with_graphs into rewrite_add_edges
removed bad reference to require messagepack
This is an updated version of the sprite sheet.
Override random box art with specific files
Merge pull request #2 from joesondow/master

Override random box with specific choices
various: add debug message logging
CC checks operational, expiry, Luhm. iFrame submit based working
multiple place holder shaders
crate shader added --- need adjustment to look nicer
Shield shader
Removed Errors in com/android/contacts/BackScrollManager.java
updated logo with new_logo_openpiv.jpg
Merge pull request #5 from alexlib/master

updated logo with new_openpiv_logo.jpg
started on the things
Correction du bug qui refusait l'actualisation depuis le scaffold des css/js
Bug sur le elseif en javascript
Fixed some dispose errors in pn.data namespace
Removed the pn.seq namespace which is obsolete since the introduction of rx
login form finished
login form
login form finished
0.0.4 - Add Stonetalon Mountains Profile
Core: Adjusted trainer opcode packets.
Core: Fixed an infinite loop on Halazzi's Lighting Totem
- that would cause server to completely hang.
Fix by Darkgroom.
(OregonCore port)

Signed-off-by: bootz <bootz@projectskyfire.org>
Some changes
Merge branch 'master' of github.com:R3VoLuT1OneR/.r3volut1oner
Some bash fixes
add rotating menu
Merge remote branch 'origin/master'

Conflicts:
	src/MenuState.as
Merge remote branch 'origin/master'

Conflicts:
	src/MenuState.as
fix commit
Underp the Audio HAL for now
RByczko-self; 2012-05-05; intermediate commit for doAstronomy.js
RByczko-self; 2012-05-05; another intermediate commit
RByczko-self; 2012-05-05; more intermediate astronomy calc-draft
why the f**k facebook is so damn stupid
Modelos y Auth

Arreglado problema con modelos y colecciones
Se quita la autenticación para desarrollo y pruebas más rápidas y sin
complicaciones por el momento
skbtrace: fix an off-by-one problem
made 1 mistake in previous commit
Add naver fonts to build target.

Change-Id: I230d0326f5c74d3c23762028175e85c9436be98d
Merge branch 'jellybean' of git://github.com/CyanogenMod/android_build into jellybean
Eat: Option to specify directory of zip in recovery mode

It pushes to /mnt/sdcard0, which may be /emmc/ in recovery. Now the user
can specify another path other than /sdcard/ where the zip is

Change-Id: Ie39615132ae39d9f6b304a3049b2395b2a2af182
Merge branch 'jellybean' of git://github.com/CyanogenMod/android_build into jellybean
fix test and make pytest ignores env when running tests
Added development environment.
refactor:
added storage for parameters | it is now kdb_parameters service
added autoload all parameters with event listener
//To do: refactor parameter manipulator
refactor:
parameter manipulator
parameter manager
hm
Merge branch 'refactor' into develop
assign sale product/page added
updated copyright in files

old: ClanSphere 2010 - www.clansphere.net
new: Shockcraft.CSP 2013 - www.shockcraft.de - www.csphere.eu
simplified code of g2
histograms degrade nicely when data is removed now. width still broken.
Mms: Updated italian translation

	Added strings for dark/light theme

Change-Id: I4b1c43a3d16db5dbf57a066b33fa5ce70feb1c56
Ported: Bluetooth Message Access Profile (MAP) from CM9

This was added to CM10 to restore message exchange capabilities with automotive systems.

Change-Id: Ia81839b905b50fbb15b6f86a3e3e4e7f4bb7c705
Refactor console commands to work within Thor's API

(rather than stomping all over it).
Spot binary should use the correct Spontaneous gem.

If inside a site root it should load the bundled version,
but if outside it should load the global gem
Release 0.2.0.alpha5
Removing jira username
Deze Mi[ps is nog veel sneller :P
Implements handler_zeromq
replace 'width=' with 'class=' on the channel type icon
add js css files and modified index.ejs layout.ejs
Revert "Change"

This reverts commit 86b5c2da272ecd67a43a772d05231cc6cc9cee7e.
asdf

Signed-off-by: Martijn Woudstra <marty007@live.nl>
2012年 06月 03日 星期日 18:59:15 CST
fixes for blog landing page and user blog landing pages
About me nag in order and use correct p tag on education
[SW] remove board id from page url
v 0.3.6 - Command to reload filters
Fixed empty chat
'C:/Program Files (x86)/Git/titanchat reload'
Add Besturn KWP

Message Box
Status Box
Initial upload of BrainGrid code

This should all compile; I am not sure if everything here is needed or
up-to-date. In particular, the documentation may not be up-to-date, and
there seems to be two copies of the Mersenne Twister code (maybe two
versions of it). But there shouldn't be anything missing.
Adding to git
Needed
Initial commit
ranking created
added access count today column in admin tool
Added top level makefile for test class
Had to change the naming of the room test, so that it would work with a recersive makefile structure.
Updates to 09/18 formatting updates
Format updates - How to make a phone call using Twilio. Both graphics updated.
Merge pull request #355 from DaleCallison/working0920formats3

#354 - Working0920formats3 - Final formatting updates to "How to make a phone call using Twilio"
added new chunk for creating MongoDB from Store
added topic in PHP common tasks to reference mongodb chunk
Merge pull request #665 from brian-swan/create-mongo-db

Created topic for how to create a MongoDB database from the WA Store.
Fixed some navigation to be closer to our specs
colori della barra
add minus, times, divide functions
Debian package version 3.6.2 @EWD-44
GoGoGo_0.1
Currently in a working state.
removed strange static directory I added but forgot why
Added collectd disk usage and metrics
Move the one image to the cdn.
Merge branch 'master' of github.com:adamdecaf/personal-website
Merge branch 'master' of github.com:adamdecaf/personal-website
Trying to fix control target
intro van README
docs on acr delegate object
Fix bugs in live-test-ws and add licence
New CSS for index and show
Update src/view.js
Gestion des erreurs par Exceptions pour DB et les fichiers liées.
remove not necessary files
update video list
regenerate pages
WIP ruby version
added incident type to pin index
editable button depends on table margin fix
Add coffeescript to gemfile
Move apple touch icon to img
added date posted
Fixed issue #47: when deleting an item via deleteItem, current selection is maintained.
login n out done
removed some dummy print statements
List + Theming
Added node type.
Create a User resource
Simplified the Users Controller
Add a Microposts resouce
Finished the demo app
Remove focus outline in WebKit browsers.
{apply,serialize}Value for HeadlineImageEditor.

This commit also adds in the requisite editor-name checks.
Client name does not appear in query
Fixed README.md
Merge branch 'release/v0.1.1' into develop
+ ‘pinstripe/contact-generic@2x.png’
/ ‘pinstripe/QFB-toolbar@2x.png’
Adicionei o README.md para o GitHub
Removed box2d files and added minified code (and latest version)
Updated line heights to em, floated nav elements
#1: time series example
Poprawki bloku kodu.
Adding logic so that  applies even w/ the mask enabled.
Deleted.mat files
use singult/unify, bikeshed a bit
remove var_dump :)
Merge branch '7.x-1.x' of github.com:apigee/apigee_drupal_theme into 7.x-1.x
added multi sibling support, also fixed minor bug in edit patient
Merge pull request #66 from armitasp/cui-changes

Client-IP-Address with Packet-Src-IP-Address for cui
tweaked node building size generation to make more realistic looking buildings
This message relates to changes in penteState
Updated published version for contest submission
Working on adding content for projects.
 Added _plugins _posts and images, few changes to gitignore.
Working on content.
added new images.:
Added posts.
Merge branch 'master' of github.com:atilton/atilton.github.com
Ready for push.
fixed conflicts.
FtCG 1.0.4.4 + source 1.0.4.4
Updated Speech ruby app1.
small changes in vision file...
xxxdafsd
Modified the regex to be a little more relaxed and accept empty messages (without headers)
Allow for the HeaderCollection to be empty
Allow message type identification
The parser functionality is already embedded into the message classes
Fixed the Headers regex
Small fixes to the Headers and Message Headers
Added a Message::parse() method and removed some garbage code
Added some tests and fixed some others
Created the base Transport class
Renamed flatten method to be more specific
Added a new method that returns the headers as an array of strings
Added missing tags in docblocks
Added the cURL Tranport. Some preliminar testing was done and it's working as it is, just need to have the UserAgent class finished to establish some hard testing
Added some basic code to the UserAgent class
ggg
Merge branch 'master' of github.com:barchart/barchart-feed-ddf

Conflicts:
	barchart-feed-ddf-client/src/test/java/com/barchart/feed/ddf/client/provider/TestBarchartFeedClient.java
Merge branch 'master' of github.com:barchart/barchart-feed-ddf
Fixed bug with multiple subscriptions
uncomplicated template selection
tweaks to work in our env